ucc_geth: Fix sneaky merge conflict regarding bus_id
[linux-2.6] / mm /
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  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: fix optional arch functions and probe_kernel_*
2008-04-17  Ingo Molnaruaccess: add probe_kernel_write()
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-16  Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/linux...
2008-04-16  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-16  KOSAKI Motohiroadd "Isolate" migratetype name to /proc/pagetypeinfo
2008-04-16  Li Zefanmemcg: fix oops in oom handling
2008-04-16  Ingo Molnarmm: sparsemem memory_present() fix
2008-04-14  Christoph Lameterslub: No need for per node slab counters if !SLUB_DEBUG
2008-04-14  Christoph Lameterslub: Move map/flag clearing to __free_slab
2008-04-14  Christoph Lameterslub: Fixes to per cpu stat output in sysfs
2008-04-14  Christoph Lameterslub: Deal with config variable dependencies
2008-04-14  Christoph Lameterslub: Reduce #ifdef ZONE_DMA by moving kmalloc_caches_d...
2008-04-14  Pekka Enbergslub: Initialize per-cpu stats
2008-04-14  Linus TorvaldsMerge git://git./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  Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2008-04-10  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-09  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-04-09  Linus TorvaldsMerge branch 'hotfixes' of git://git.linux-nfs.org...
2008-04-09  KAMEZAWA Hiroyukimemcg: fix node_state handling
2008-04-08  David S. MillerMerge branch 'net-2.6.26-isatap-20080403' of git:/...
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-04  Linus TorvaldsMerge branch 'upstream' of git://git./linux/kernel...
2008-04-04  Balbir Singhmemory controller: make memory resource control aware...
2008-04-03  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-03  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-04-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
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  Christoph LameterFix undefined count_partial if !CONFIG_SLABINFO
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  Linus TorvaldsMerge branch 'drm-fixes' of git://git./linux/kernel...
2008-03-30  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-03-30  Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-03-30  Al ViroNULL noise: fs/*, mm/*, kernel/*
2008-03-28  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-28  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-03-28  Linus TorvaldsRevert "SLUB: remove useless masking of GFP_ZERO"
2008-03-27  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
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-26  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-26  Nishanth Aravamudanhugetlb: fix potential livelock in return_unused_surplu...
2008-03-26  Nishanth Aravamudanhugetlb: indicate surplus huge page counts in per-node...
2008-03-26  Linus TorvaldsMerge branch 'slab-linus' of git://git./linux/kernel...
2008-03-26  Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-03-26  Daniel Yeisleyslab: fix cache_cache bootstrap in kmem_cache_init()
2008-03-26  Christoph Lametercount_partial() is not used if !SLUB_DEBUG and !CONFIG_...
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 branch 'for-linus' of git://git./linux/kernel...
2008-03-25  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-03-25  Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-03-25  Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-linus
2008-03-25  Andrew Mortonrevert "kswapd should only wait on IO if there is IO"
2008-03-25  Yinghai Lumm: fix boundary checking in free_bootmem_core
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-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/davem/net-2.6
next