Russell King 7d83f8fca5 Merge branch 'master' of git://git.marvell.com/orion into devel ...

Conflicts:

	arch/arm/mach-mx1/devices.c

2009-03-19 23:10:40 +00:00

..

clock.c

[ARM] MXC: remove _clk suffix from clock names

2009-03-13 10:33:48 +01:00

crm_regs.h

…

devices.c

[ARM] mxc: add missing include

2009-03-13 10:34:17 +01:00

devices.h

…

generic.c

…

Kconfig

arm/imx: Kconfig beautification

2009-03-13 10:34:18 +01:00

Makefile

[ARM] Add Synertronixx scb9328 board support

2009-03-13 10:34:16 +01:00

Makefile.boot

…

mx1ads.c

Merge branch 'master' of git://git.marvell.com/orion into devel

2009-03-19 23:10:40 +00:00

scb9328.c

[ARM] Add Synertronixx scb9328 board support

2009-03-13 10:34:16 +01:00