Russell King 988addf82e Merge branch 'origin' into devel-stable
Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c
2010-03-08 20:21:04 +00:00
..
2008-12-16 14:58:40 +01:00
2008-12-16 14:58:41 +01:00
2009-03-13 10:34:18 +01:00
2008-12-16 14:58:40 +01:00