ucc_geth: Fix sneaky merge conflict regarding bus_id
[linux-2.6] / ipc /
2008-04-18  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-17  Tony LuckPull virt-cpu-accounting into release branch
2008-04-17  Tony LuckPull fsys_gettimeofday into release branch
2008-03-27  Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-03-27  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-24  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-21  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-20  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
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-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-13  Len BrownMerge branches 'release', 'ejd', 'sony' and 'wmi' into...
2008-03-13  Len BrownMerge branches 'release', 'button-sysfs', 'misc', ...
2008-03-13  Len BrownMerge branches 'release', 'bugzilla-8570', 'bugzilla...
2008-03-13  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-03-13  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-03-12  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-11  Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-03-11  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-11  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-03-11  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/usb-2.6
2008-03-11  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/pci-2.6
2008-03-11  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/driver-2.6
2008-03-11  Linus TorvaldsMerge git://git./linux/kernel/git/rusty/linux-2.6-for...
2008-03-11  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-03-11  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-03-11  Lee Schermerhornmempolicy: fix reference counting bugs
2008-02-18  Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-15  Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-02-11  Linus TorvaldsMerge branch 'for-linus' of git://linux-nfs.org/~bfield...
2008-02-11  Jeff GarzikMerge branch 'r6040' of git://git./linux/kernel/git...
2008-02-09  Russell KingMerge branches 'master', 'omap1-upstream' and 'orion...
2008-02-09  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-09  David S. MillerMerge branch 'pending' of /linux/kernel/git/vxy/lksctp-dev
2008-02-08  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-02-08  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-08  Linus TorvaldsMerge branch 'cris' of git://www.jni.nu/cris
2008-02-08  Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/linux...
2008-02-08  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-08  Linus TorvaldsMerge branch 'for-2.6.25' of git://git./linux/kernel...
2008-02-08  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-08  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-08  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-02-08  Pavel EmelyanovPidns: fix badly converted mqueues pid handling
2008-02-08  Pavel EmelyanovPidns: make full use of xxx_vnr() calls
2008-02-08  Pierre PeifferIPC: consolidate sem_exit_ns(), msg_exit_ns() and shm_e...
2008-02-08  Pierre PeifferIPC: make struct ipc_ids static in ipc_namespace
2008-02-08  Pierre PeifferIPC/semaphores: consolidate SEM_STAT and IPC_STAT commands
2008-02-08  Pavel Emelyanovipc: uninline some code from util.h
2008-02-08  Pavel Emelyanovnamespaces: move the IPC namespace under IPC_NS option
2008-02-08  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2008-02-07  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-02-07  Linus TorvaldsMerge branch 'for-2.6.25' of git://git./linux/kernel...
2008-02-07  Len BrownMerge branches 'release' and 'throttling-domains' into...
2008-02-07  Len BrownMerge branches 'release' and 'wmi-2.6.25' into release
2008-02-07  Len BrownMerge branches 'release' and 'menlo' into release
2008-02-07  Len BrownMerge branches 'release' and 'stats' into release
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' and 'dmi' 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 git://git./linux/kernel/git/x86/linux-2.6-x86
2008-02-06  Linus TorvaldsMerge branch 'async-tx-for-linus' of git://lost.foo...
2008-02-06  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-06  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-02-06  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-06  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-06  Adrian Bunkmake ipc/util.c:sysvipc_find_ipc() static
2008-02-06  Pierre PeifferIPC: fix error check in all new xxx_lock() and xxx_exit...
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-01-25  Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-01-17  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-14  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-11  Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2007-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2007-12-17  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-12-14  Len BrownPull hotplug into release branch
2007-12-10  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-12-08  Russell KingMerge branch 'pxa-fixes'
2007-12-06  Len BrownPull bugzilla-9345 into release branch
2007-12-06  Len BrownPull apm-freeze-fix into release branch
2007-12-05  Paul MackerrasMerge branch 'for-2.6.25' of git://git./linux/kernel...
2007-12-03  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2007-12-03  Linus TorvaldsMerge git://git./linux/kernel/git/herbert/net-2.6
2007-12-02  Len BrownPull thermal into release branch
2007-12-01  Jeff GarzikMerge branch 'fixes-jgarzik' of git://git./linux/kernel...
2007-12-01  Jeff GarzikMerge branch 'master' into upstream-fixes
2007-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-11-30  Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
next