q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/powerpc/platforms/83xx
History
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree 
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
asp834x.c powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:04 -05:00
Kconfig powerpc/83xx: Add support for MPC8377E-WLAN boards 2009-08-20 10:27:43 +10:00
kmeter1.c 83xx: add support for the kmeter1 board. 2009-06-15 22:15:09 -05:00
Makefile 83xx: add support for the kmeter1 board. 2009-06-15 22:15:09 -05:00
mcu_mpc8349emitx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
misc.c [POWERPC] 83xx: Don't call ioremap in the reset function 2007-01-26 00:37:11 -06:00
mpc83xx.h powerpc/83xx: Add eSDHC support for MPC837xE-RDB/WLAN boards 2009-08-20 10:27:51 +10:00
mpc831x_rdb.c powerpc/83xx: Add MCU LEDs support for MPC837xRDB and MPC8315RDB boards 2010-05-17 10:55:32 -05:00
mpc832x_mds.c powerpc/83xx: Fix sparse warnings in board files 2008-12-30 11:13:41 -06:00
mpc832x_rdb.c powerpc: Fix build of some FSL platforms 2009-11-24 17:00:27 +11:00
mpc834x_itx.c powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:04 -05:00
mpc834x_mds.c powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:04 -05:00
mpc836x_mds.c powerpc/83xx: Add USB Host/Gadget support for MPC8360E-MDS boards 2008-12-30 11:13:46 -06:00
mpc836x_rdk.c powerpc/83xx: Fix few build errors with CONFIG_QUICC_ENGINE=n 2008-12-30 11:14:05 -06:00
mpc837x_mds.c powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:04 -05:00
mpc837x_rdb.c powerpc/83xx: Add MCU LEDs support for MPC837xRDB and MPC8315RDB boards 2010-05-17 10:55:32 -05:00
sbc834x.c powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:04 -05:00
suspend-asm.S powerpc/mpc83xx: Power Management support 2008-07-16 17:57:30 -05:00
suspend.c of: Remove duplicate fields from of_platform_driver 2010-05-22 00:10:40 -06:00
usb.c powerpc/mpc83xx: Fix usb mux setup for mpc834x 2009-06-15 21:45:31 -05:00