Benjamin Herrenschmidt 1e7342e778 Merge remote-tracking branch 'jwb/next' into next ... Conflicts: arch/powerpc/platforms/40x/ppc40x_simple.c		2011-12-16 11:24:25 +11:00
..
acadia_defconfig	net: fix IBM EMAC driver after rename.	2011-08-18 21:33:49 -07:00
ep405_defconfig	net: fix IBM EMAC driver after rename.	2011-08-18 21:33:49 -07:00
kilauea_defconfig	net: fix IBM EMAC driver after rename.	2011-08-18 21:33:49 -07:00
klondike_defconfig	powerpc/40x: Add APM8018X SOC support	2011-11-30 10:02:15 -05:00
makalu_defconfig	net: fix IBM EMAC driver after rename.	2011-08-18 21:33:49 -07:00
obs600_defconfig	powerpc: Add support for OpenBlockS 600	2011-12-08 14:22:52 +11:00
virtex_defconfig	powerpc: Trim defconfigs	2010-08-09 11:19:16 +10:00
walnut_defconfig	net: fix IBM EMAC driver after rename.	2011-08-18 21:33:49 -07:00