Russell King 97fb44eb6b Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel ...

Conflicts:

	arch/arm/mach-at91/gpio.c

2009-03-13 21:44:51 +00:00

..

include/mach

…

dma.c

…

irq.c

…

Makefile

…

Makefile.boot

…

riscpc.c

Add i2c_board_info for RiscPC PCF8583

2009-02-24 19:19:50 +01:00