ucc_geth: Fix sneaky merge conflict regarding bus_id
[linux-2.6] / drivers / net / wireless / orinoco.h
2008-02-07  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07  Len BrownMerge branches 'release', 'misc' and 'misc-2.6.25'...
2008-02-07  Len BrownMerge branches 'release' and 'ppc-workaround' into...
2008-02-07  Len BrownMerge branches 'release' and 'hp-cid' into release
2008-02-07  Len BrownMerge branches 'release' and 'gpe-ack' into release
2008-02-07  Len BrownMerge branches 'release', 'cpuidle-2.6.25' and 'idle...
2008-02-07  Len BrownMerge branches 'release', 'bugzilla-6217', 'bugzilla...
2008-02-07  Len BrownMerge branches 'release' and 'autoload' into release
2008-02-07  Len BrownMerge branches 'release', 'asus', 'sony-laptop' and...
2008-02-07  Len BrownMerge branches 'release', 'acpi_pm_device_sleep_state...
2008-02-06  Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-03  David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-02-03  David WoodhouseMerge git://git.infradead.org/~kmpark/onenand-mtd-2.6
2008-02-03  David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-01  Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31  Paul MackerrasMerge branch 'linux-2.6'
2008-01-30  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/driver-2.6
2008-01-29  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6.25
2008-01-28  Dan Williamsorinoco: more reliable scan handling
2006-12-12  Dave JonesMerge ../linus
2006-11-30  Wim Van SebroeckMerge ../linux-2.6-watchdog-mm
2006-10-23  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2006-10-22  David WoodhouseMerge git://git.infradead.org/~dwmw2/cafe-2.6
2006-10-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-10-21  Jeff GarzikMerge tag 'jg-20061012-00' of git://electric-eye.fr...
2006-10-21  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-10-11  Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-08  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-10-06  Jeff GarzikMerge branch 'master' into upstream-fixes
2006-10-05  Linus TorvaldsMerge git://git.infradead.org/~dhowells/irq-2.6
2006-10-05  David HowellsIRQ: Maintain regs pointer globally rather than passing...
2006-10-04  Paul MackerrasMerge branch 'master' of git://oak/home/sfr/kernels...
2006-10-02  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-10-01  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-09-30  Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-09-30  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2006-09-30  Linus TorvaldsMerge branch 'intelfb-patches' of /linux/kernel/git...
2006-09-28  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-mmc
2006-09-28  Russell KingMerge nommu branch
2006-09-27  Paul MackerrasMerge branch 'upstream' of git://git./linux/kernel...
2006-09-27  Russell KingMerge /linux/kernel/git/tmlind/linux-omap-upstream...
2006-09-27  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-09-26  Tony LuckPull model-name into release branch
2006-09-25  Steven Whitehouse[GFS2] Fix up merge of Linus' kernel into GFS2
2006-09-25  David S. MillerMerge /pub/scm/linux/kernel/git/acme/net-2.6
2006-09-24  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-09-24  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-09-24  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-09-24  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-09-23  Jeff GarzikMerge tag 'r8169-20060920-00' of git://electric-eye...
2006-09-23  Jeff GarzikMerge branch 'master' into upstream
2006-09-21  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-20  Jeff GarzikMerge branch 'master' into upstream
2006-09-19  Jeff GarzikMerge branch 'master' into upstream
2006-09-17  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-17  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-13  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-13  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-13  Jeff GarzikMerge tag 'r8169-20060912-00' of git://electric-eye...
2006-09-13  Jeff GarzikMerge tag '8139cp-20060912-00' of git://electric-eye...
2006-09-12  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-12  Jeff GarzikMerge branch 'tmp' into upstream
2006-09-12  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-11  John W. LinvilleMerge branch 'upstream-fixes' into upstream
2006-09-11  John W. LinvilleMerge branch 'from-linus' into upstream
2006-09-11  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-11  Jeff GarzikMerge branch 'master' into upstream
2006-09-06  Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-06  Jeff GarzikMerge branch 'upstream' of /linux/kernel/git/linville...
2006-08-29  Pavel Roskin[PATCH] orinoco: Don't use "extern inline" on locking...
2006-07-15  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-07-04  Linus TorvaldsMerge git://git.infradead.org/hdrinstall-2.6
2006-07-04  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-06-28  Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-06-26  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-06-26  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-06-24  Russell KingMerge signal handler branch
2006-06-23  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-06-23  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-mmc
2006-06-23  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-06-23  Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-06-23  Jeff GarzikMerge branch 'master' into upstream
2006-06-21  Tony LuckPull rework-memory-attribute-aliasing into release...
2006-06-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-06-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-06-21  Linus TorvaldsMerge git://git./linux/kernel/git/bcollins/linux1394-2.6
2006-06-21  Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2006-06-20  Linus TorvaldsMerge branch 'rio.b19' of git://git./linux/kernel/git...
2006-06-20  Linus TorvaldsMerge branch 'audit.b21' of git://git./linux/kernel...
2006-06-20  Linus TorvaldsMerge git://git.infradead.org/hdrcleanup-2.6
2006-06-20  Linus TorvaldsMerge git://git.infradead.org/~dwmw2/rbtree-2.6
2006-06-20  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2006-06-20  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-06-20  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-06-20  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-06-20  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-06-20  Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-06-20  Steven WhitehouseMerge branch 'master'
2006-06-20  Jeff GarzikMerge branch 'upstream' of git://electric-eye.fr.zoreil...
next