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

..

mach

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

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