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)
commit4cb73288b195dc04c1f604c38bd4ebd2081db9fa
tree7aa025e7a48994aaaeec659b46d246c224a42a25
parent70c91a384918736afee13104eea059cc7c8728a1
parent66ddfc62caec65a25fd5a8b20f535a2958ee94e6
Merge branch 'mxc-rc' into mxc-master
arch/arm/mach-mx25/mx25pdk.c
arch/arm/mach-mx3/mach-mx31ads.c