Merge branch 'hsmmc' into fixes-non-critical
authorTony Lindgren <tony@atomide.com>
Wed, 29 Feb 2012 00:15:06 +0000 (16:15 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Feb 2012 00:15:06 +0000 (16:15 -0800)
commit824e2dbb29eedb4afde9cb592a912f56038a5d1e
tree16831eceadb66c7fc661e387f81fc65c93742c1e
parente9d69010996539b07caef1c9fa9a481e1df95e68
parent9cf793f9b8b1ba9414e2a7591b2e911885f85a27
Merge branch 'hsmmc' into fixes-non-critical
arch/arm/mach-omap2/devices.c