sh: Fix up some merge damage.
[linux-2.6] / arch / m32r /
2008-10-20  Paul MundtMerge branch 'master' of git://git./linux/kernel/git...
2008-10-17  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/staging-2.6
2008-10-17  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-17  Linus TorvaldsMerge branch 'for-linus' of git://www.jni.nu/cris
2008-10-17  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-10-17  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-16  Linus TorvaldsMerge git://git.linux-nfs.org/projects/trondmy/nfs-2.6
2008-10-16  Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-10-16  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-16  Linus TorvaldsMerge branch 'kvm-updates/2.6.28' of git://git./linux...
2008-10-16  Linus TorvaldsMerge branch 'core-v28-for-linus' of git://git./linux...
2008-10-16  Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-16  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-16  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-16  Linus TorvaldsMerge branch 'agp-next' of git://git./linux/kernel...
2008-10-16  Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/driver-core-2.6
2008-10-16  Linus TorvaldsMerge git://git./linux/kernel/git/rusty/linux-2.6-for...
2008-10-16  Linus TorvaldsMerge branch 'personality' of git://git390.osdl.marist...
2008-10-16  Linus TorvaldsMerge branch 'docs' of git://git.lwn.net/linux-2.6
2008-10-16  Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-10-16  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-16  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-16  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-16  Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-10-16  Harvey Harrisonmisc: replace __FUNCTION__ with __func__
2008-10-16  Dmitry TorokhovMerge branch 'next' into for-linus
2008-10-15  Russell KingMerge branch 'fixes' into for-linus
2008-10-15  Trond MyklebustMerge branch 'next'
2008-10-15  Ingo MolnarMerge branches 'core/softlockup', 'core/softirq', ...
2008-10-15  Benjamin HerrenschmidtMerge commit 'origin'
2008-10-14  Russell KingMerge branch 's3c-move' into devel
2008-10-14  Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-10-14  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-14  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-13  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-10-13  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-10-13  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-13  Linus TorvaldsMerge branch 'proc' of git://git./linux/kernel/git...
2008-10-13  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-13  Linus TorvaldsMerge git://git.infradead.org/users/dwmw2/random-2.6
2008-10-13  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-10-13  Ingo MolnarMerge branches 'oprofile-v2' and 'timers/hpet' into...
2008-10-13  Ingo MolnarMerge branch 'linus' into oprofile-v2
2008-10-12  Linus TorvaldsMerge git://git./linux/kernel/git/hskinnemoen/avr32-2.6
2008-10-12  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-12  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-10-12  Ingo MolnarMerge branches 'x86/xen', 'x86/build', 'x86/microcode...
2008-10-12  Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-10-12  Ingo MolnarMerge branch 'linus' into x86/xsave
2008-10-12  Ingo MolnarMerge branch 'linus' into x86/memory-corruption-check
2008-10-12  Ingo MolnarMerge branch 'linus' into x86/signal
2008-10-12  Ingo MolnarMerge branch 'linus' into x86/quirks
2008-10-12  Ingo MolnarMerge branch 'linus' into x86/spinlocks
2008-10-12  Ingo MolnarMerge branch 'linus' into x86/xen
2008-10-12  Ingo MolnarMerge branch 'x86/urgent' into core/signal
2008-10-11  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-10-11  Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-10-11  David S. MillerMerge branch 'master' of /linux/kernel/git/torvalds...
2008-10-11  Linus TorvaldsMerge phase #4 (X2APIC, APIC unification, CPU identific...
2008-10-11  Ingo MolnarMerge branch 'x86/unify-cpu-detect' into x86-v28-for...
2008-10-11  Ingo MolnarMerge branch 'x86/apic' into x86-v28-for-linus-phase4-B
2008-10-11  Linus TorvaldsMerge phase #3 (IOMMU) of git://git./linux/kernel/git...
2008-10-11  Linus TorvaldsMerge phase #2 (PAT updates) of git://git./linux/kernel...
2008-10-11  Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-10-11  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-10-11  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-10-11  Linus TorvaldsMerge branch 'for-linus' of git://git.alsa-project...
2008-10-11  Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-10-11  Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-10-10  James MorrisMerge branch 'master' of git://git.infradead.org/users...
2008-10-10  Linus TorvaldsMerge branch 'rcu-v28-for-linus' of git://git./linux...
2008-10-10  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-10  Linus TorvaldsMerge branch 'sched-v28-for-linus' of git://git./linux...
2008-10-10  Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-10-10  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-10  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-10  Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2008-10-10  Ingo MolnarMerge branches 'core/iommu', 'x86/amd-iommu' and 'x86...
2008-10-10  Ingo MolnarMerge branch 'linus' into x86/pat2
2008-10-10  Linus TorvaldsMerge branch 'upstream-2.6.28' of git://git./linux...
2008-10-10  Ingo MolnarMerge commit 'v2.6.27' into timers/hpet
2008-10-10  James MorrisMerge branch 'next' into for-linus
2008-10-08  Ingo MolnarMerge branches 'sched/devel', 'sched/cpu-hotplug',...
2008-10-06  Simon HormanMerge git://git./linux/kernel/git/davem/net-next-2...
2008-10-06  Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-10-06  Ingo MolnarMerge branches 'x86/alternatives', 'x86/cleanups',...
2008-10-06  Ingo MolnarMerge branch 'x86/tracehook' into x86-v28-for-linus...
2008-10-06  Ingo MolnarMerge branch 'x86/prototypes' into x86-v28-for-linus...
2008-10-06  Ingo MolnarMerge branch 'x86/pebs' into x86-v28-for-linus-phase1
2008-10-06  Ingo MolnarMerge branch 'x86/header-guards' into x86-v28-for-linus...
2008-10-06  Ingo MolnarMerge branch 'linus' into sched/devel
2008-10-03  Ingo MolnarMerge commit 'v2.6.27-rc8' into x86/setup
2008-10-03  Ingo MolnarMerge commit 'v2.6.27-rc8' into core/rcu
2008-10-02  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-01  Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-01  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-09-30  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
next