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
..
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2008-12-01 11:53:07 +00:00
2008-09-06 12:10:45 +01:00
2009-01-25 17:36:34 +00:00
2008-12-01 11:53:07 +00:00
2008-09-05 14:11:24 +01:00
2008-12-01 11:53:07 +00:00
2008-11-27 12:37:59 +00:00