[XFS] Fix merge failures
[pandora-kernel.git] / arch / powerpc / platforms / 40x / ep405.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-18 Paul MackerrasMerge branch 'linux-2.6' into next
2008-12-17 Paul MackerrasMerge branch 'next' of /linux/kernel/git/jwboyer/powerp...
2008-12-16 Josh Boyerpowerpc: Introduce ppc_pci_flags accessors
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-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-29 Russell KingMerge branches 'pxa' and 'orion-fixes1'
2008-04-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-25 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-24 Trond MyklebustMerge branch 'devel'
2008-04-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-24 Linus TorvaldsMerge branch 'fixes' of /home/rmk/linux-2.6-arm
2008-04-24 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-04-23 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-04-23 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-04-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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-22 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-22 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-04-21 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-21 Linus TorvaldsMerge branch 'for-2.6.26' of git://git.kernel.dk/linux...
2008-04-21 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-21 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/pci-2.6
2008-04-21 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-04-21 Linus TorvaldsMerge branch 'irq-cleanups-upstream' of git://git....
2008-04-21 Linus TorvaldsMerge branch 'isdn-cleanups' of git://git./linux/kernel...
2008-04-21 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2008-04-18 Paul MackerrasMerge branch 'master' of git://git./linux/kernel/git...
2008-04-14 Paul MackerrasMerge branch 'linux-2.6'
2008-04-03 Stefan Roese[POWERPC] 4xx: Create common ppc4xx_reset_system()...
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
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', '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 branch 'dmapool' of git://git./linux/kernel/git...
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-02-02 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-01 Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31 Linus TorvaldsMerge branch 'for-2.6.25' of git://git./linux/kernel...
2008-01-31 Paul MackerrasMerge branch 'linux-2.6'
2008-01-23 Paul MackerrasMerge branch 'linux-2.6'
2007-12-31 Paul MackerrasMerge branch 'for-2.6.25' of git://git./linux/kernel...
2007-12-24 Josh Boyer[POWERPC] 4xx: Use machine_device_initcall for bus...
2007-12-24 Josh Boyer[POWERPC] 4xx: Mark of_bus structures as __initdata
2007-12-23 Benjamin Herrenschmidt[POWERPC] pci32: 4xx embedded platforms want to reassig...
2007-12-23 Benjamin Herrenschmidt[POWERPC] 4xx: EP405 boards support for arch/powerpc