Merge branch 'mxc-rc' into mxc-master
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 29 Jan 2010 09:43:17 +0000 (10:43 +0100)
committerSascha Hauer <s.hauer@pengutronix.de>
Fri, 29 Jan 2010 09:43:17 +0000 (10:43 +0100)
1  2 
arch/arm/mach-mx25/mx25pdk.c
arch/arm/mach-mx3/mach-mx31ads.c

Simple merge
Simple merge