[XFS] Fix merge failures
[linux-2.6] / arch / m32r / kernel /
2008-12-28  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-25  Takashi IwaiMerge branch 'topic/udev-id-rename' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/pcxhr-update' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/oxygen' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/audigy-capture-boost' into to-push
2008-12-25  Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-23  Ingo MolnarMerge branch 'x86/iommu' into x86/core
2008-12-23  Ingo MolnarMerge branch 'x86/ptrace' into x86/tsc
2008-12-23  Ingo MolnarMerge branches 'x86/apic', 'x86/cleanups', 'x86/cpufeat...
2008-12-23  Ingo MolnarMerge commit 'v2.6.28-rc9' into x86/apic
2008-12-20  Takashi IwaiMerge branch 'topic/ca0106-spdif-stream' into topic...
2008-12-20  Takashi IwaiMerge branch 'topic/ca0106-resume' into topic/ca0106
2008-12-20  Takashi IwaiMerge branch 'topic/ca0106-capture-no-44khz' into topic...
2008-12-20  Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19  Takashi IwaiMerge branch 'fix/asoc' into for-linus
2008-12-19  Takashi IwaiMerge branch 'fix/asoc' into topic/asoc
2008-12-19  Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-18  Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-18  Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-12-16  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/uv
2008-12-16  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/doc
2008-12-16  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/cpufeature
2008-12-12  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/irq
2008-12-12  Ingo MolnarMerge commit 'v2.6.28-rc8' into x86/mm
2008-12-09  Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-12-08  Ingo MolnarMerge branch 'linus' into x86/quirks
2008-12-08  Ingo MolnarMerge branch 'sched/urgent' into sched/core
2008-12-05  Linus TorvaldsMerge branch 'timers-fixes-for-linus' of git://git...
2008-12-05  Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2.6
2008-12-04  Ingo MolnarMerge commit 'v2.6.28-rc7' into x86/cleanups
2008-12-04  Ingo MolnarMerge branches 'tracing/ftrace' and 'tracing/function...
2008-12-04  Ingo MolnarMerge commit 'v2.6.28-rc7' into tracing/core
2008-12-04  James MorrisMerge branch 'master' into next
2008-12-04  Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-12-03  Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-12-03  Paul MackerrasMerge branch 'merge'
2008-12-03  Ingo MolnarMerge commit 'v2.6.28-rc7'; branch 'x86/dumpstack'...
2008-12-03  David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-12-03  David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-12-02  Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-12-02  Linus TorvaldsMerge branch 'kvm-updates/2.6.28' of git://git./linux...
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-12-02  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-12-02  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-01  Takashi IwaiMerge branch 'upstream' into topic/asoc
2008-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-01  Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-12-01  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2008-11-30  Linus TorvaldsMerge git://git./linux/kernel/git/kyle/parisc-2.6
2008-11-30  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-11-30  Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-11-30  Linus TorvaldsMerge branch 'irq-fixes-for-linus' of git://git./linux...
2008-11-30  Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-11-30  Linus TorvaldsMerge branch 'tracing-fixes-for-linus' of git://git...
2008-11-30  Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-11-30  Linus TorvaldsMerge branch 'drm-fixes' of git://git./linux/kernel...
2008-11-30  Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-11-30  Linus TorvaldsMerge branch 'fixes' of git://git./linux/kernel/git...
2008-11-30  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-30  Linus TorvaldsMerge branch 'linux-next' of git://git.infradead.org...
2008-11-30  Linus TorvaldsMerge branch 'i2c-for-linus' of git://jdelvare.pck...
2008-11-30  Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-11-30  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-11-30  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-30  Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2008-11-30  Al Virom32r: section noise in head.S
2008-11-26  Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25  Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24  Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-21  Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-18  Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-12  Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-10  Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-06  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06  Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-05  James MorrisMerge branch 'master' into next
2008-11-03  Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-10-31  Takashi IwaiMerge commit 'v2.6.28-rc2' into topic/asoc
2008-10-30  Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-30  Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/asoc...
2008-10-29  Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-10-28  Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-28  Paul MundtMerge branches 'sh/serial-rework' and 'sh/oprofile'
2008-10-27  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27  Takashi IwaiMerge branches 'topic/fix/asoc', 'topic/fix/hda', ...
2008-10-26  Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-10-26  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-26  Linus TorvaldsMerge branch 'for-upstream' of git://git./linux/kernel...
2008-10-26  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-25  Len BrownMerge branch 'i7300_idle' into release
2008-10-24  Ingo MolnarMerge commit 'v2.6.28-rc1' into sched/urgent
2008-10-23  Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23  Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23  Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
next