Merge branch 'omap_hsmmc'
authorTony Lindgren <tony@atomide.com>
Tue, 9 Dec 2008 19:57:05 +0000 (11:57 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 9 Dec 2008 19:57:05 +0000 (11:57 -0800)

Trivial merge