Merge remote-tracking branch 'omap/hsmmc' into for_3.4/cleanup/pm-base
authorKevin Hilman <khilman@ti.com>
Mon, 5 Mar 2012 23:37:04 +0000 (15:37 -0800)
committerKevin Hilman <khilman@ti.com>
Mon, 5 Mar 2012 23:37:04 +0000 (15:37 -0800)

Trivial merge