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
..
2008-12-16 14:58:40 +01:00
2009-03-13 10:34:17 +01:00
2008-12-16 14:58:41 +01:00
2008-12-16 14:58:40 +01:00
2009-03-13 10:34:18 +01:00
2008-12-16 14:58:40 +01:00