ucc_geth: Fix sneaky merge conflict regarding bus_id
[linux-2.6] / lib /
2008-04-19  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-19  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6.26
2008-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-04-18  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-04-18  Stefan Richterfirewire: fw-ohci: add option for remote debugging
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2008-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-04-18  Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-04-18  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/tglx/linux-2.6-hrt
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-kgdb
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  Linus TorvaldsMerge branch 'semaphore' of git://git./linux/kernel...
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-18  David S. MillerMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-17  Jason Wesselkgdb: allow static kgdbts boot configuration
2008-04-17  Jason Wesselkgdb: add kgdb internal test suite
2008-04-17  Jason Wesselkgdb: core
2008-04-17  Tony LuckPull miscellaneous into release branch
2008-04-17  Tony LuckPull nptcg into release branch
2008-04-17  Tony LuckPull kvm-patches into release branch
2008-04-17  Tony LuckPull percpureserve into release branch
2008-04-17  Tony LuckPull regset into release branch
2008-04-17  Tony LuckPull virt-cpu-accounting into release branch
2008-04-17  Tony LuckPull fsys_gettimeofday into release branch
2008-04-17  Matthew WilcoxRemove DEBUG_SEMAPHORE from Kconfig
2008-04-17  Matthew WilcoxGeneric semaphore implementation
2008-04-17  Matthew WilcoxAdd semaphore.h to kernel_lock.c
2008-04-16  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-14  Christoph Lameterslub: Deal with config variable dependencies
2008-04-14  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-04-14  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-14  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-14  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-04-11  Linus TorvaldsMerge branch 'docs' of git://git.lwn.net/linux-2.6
2008-04-11  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-11  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-10  Harvey Harrisonlzo: fix typo in decompressor
2008-04-08  David S. MillerMerge branch 'net-2.6.26-isatap-20080403' of git:/...
2008-04-07  FUJITA Tomonori[SCSI] block: add sg buffer copy helper functions
2008-04-07  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-07  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-03  Andi Kleen[NET]: srandom32 fixes for networking v2
2008-04-03  Denis V. Lunev[NETNS]: Declare init_net even without CONFIG_NET defined.
2008-04-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-01  Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6.25
2008-04-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-04-01  Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-04-01  Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into for...
2008-03-30  Mark Lordfix uevent action-string regression
2008-03-28  Pavel Emelyanov[LIB]: Drop the pcounter itself.
2008-03-28  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-28  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-27  Denis V. Lunev[NETNS]: Do no include NET related headers if CONFIG_NE...
2008-03-27  Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-03-27  Len BrownMerge branches 'release', 'idle', 'redhat-bugzilla...
2008-03-27  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-27  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-25  Linus TorvaldsMerge branch 'i2c-for-linus' of git://jdelvare.pck...
2008-03-25  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-25  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-linus
2008-03-25  Paul MackerrasMerge branch 'linux-2.6' into merge
2008-03-24  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-03-24  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-24  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-24  Linus Torvaldsx86-32: Pass the full resource data to ioremap()
2008-03-23  David S. MillerMerge branch 'upstream-net26' of /linux/kernel/git...
2008-03-23  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-23  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-03-21  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-21  Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6.25
2008-03-20  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-20  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-03-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-18  Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/linux...
2008-03-18  Linus TorvaldsMerge branch 'drm-fixes' of git://git./linux/kernel...
2008-03-18  Len BrownMerge branches 'release' and 'dock' into release
2008-03-18  Len BrownMerge branches 'release', 'asus', 'bugzilla-8573',...
2008-03-18  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-18  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-03-17  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-03-17  Tejun Heodevres: implement pcim_iomap_regions_request_all()
2008-03-16  Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-03-15  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-14  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-14  Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-03-13  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
next