[XFS] Fix merge failures
[pandora-kernel.git] / arch / powerpc / platforms / cell / setup.c
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-29 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-23 Anton Vorontsovpowerpc: Remove default kexec/crash_kernel ops assignments
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
2008-07-03 Russell KingMerge branch 'fb' into devel
2008-05-07 Russell KingMerge branch 'irq-fix' of git://modarm9.com/gitsrc...
2008-05-06 Jiri KosinaMerge branch 'master' of git://git./linux/kernel/git...
2008-05-03 Linus TorvaldsMerge git://git.infradead.org/battery-2.6
2008-05-01 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-05-01 Linus TorvaldsMerge branch 'release' of git://lm-sensors.org/kernel...
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-05-01 David S. MillerMerge branch 'master' of /linux/kernel/git/linville...
2008-05-01 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-30 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-30 Paul MackerrasMerge git://git./pub/scm/linux/kernel/git/jk/spufs
2008-04-29 Russell KingMerge branch 'orion-fixes2'
2008-04-29 Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-29 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-27 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-25 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-04-24 Trond MyklebustMerge branch 'devel'
2008-04-24 Ishizaki Kou[POWERPC] cell: Generalize io-workarounds code
2008-04-22 Linus TorvaldsMerge branch 'for_linus' of git://git./linux/kernel...
2008-04-22 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-04-20 Haavard SkinnemoenMerge branch 'master' of git://git./linux/kernel/git...
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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-08 David S. MillerMerge branch 'net-2.6.26-isatap-20080403' of 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/davem/net-2.6
2008-04-01 Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into for...
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 Paul MackerrasMerge branch 'linux-2.6'
2008-03-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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
2008-03-21 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6.25
2008-03-20 Linus TorvaldsMerge branch 'hotfixes' of git://git.linux-nfs.org...
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-20 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-03-19 Michael Ellerman[POWERPC] Hide resources on Axon PCIE root complex...
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-15 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
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 Paul MackerrasMerge branch 'linux-2.6'
2008-03-12 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-11 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-09 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-03-08 Trond MyklebustMerge commit 'origin' into devel
2008-03-07 Linus TorvaldsMerge branch 'hotfixes' of git://git.linux-nfs.org...
2008-03-06 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-03-06 Linus TorvaldsMerge branch 'for-linus' of git://git.infradead.org...
2008-03-06 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
2008-03-05 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-03-05 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-03-04 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-03-04 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-03-03 Christoph LameterMerge branch 'master' of git://git./linux/kernel/git...
2008-03-03 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-03-03 Linus TorvaldsMerge git://git./linux/kernel/git/x86/linux-2.6-x86
2008-03-03 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2008-03-03 Paul MackerrasMerge branch 'for-2.6.25' of /linux/kernel/git/arnd...
2008-03-03 Jens Osterkamp[POWERPC] enable hardware watchpoints on cell blades
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 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 'for-linus' of git://git./linux/kernel...
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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 branch 'upstream-linus' of git://git./linux/kerne...
2008-02-07 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-07 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-02-07 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-02-07 Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
next