Russell King ed40d0c472 Merge branch 'origin' into devel ... Conflicts: sound/soc/pxa/pxa2xx-i2s.c		2009-03-28 20:29:51 +00:00
..
mach	[ARM] s3c: define __io using the typesafe version	2008-12-18 23:29:15 +00:00
plat	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00:00