Merge branch 'fixes-mmc' into fixes
authorTony Lindgren <tony@atomide.com>
Mon, 20 Feb 2012 18:11:08 +0000 (10:11 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 20 Feb 2012 18:11:08 +0000 (10:11 -0800)

Trivial merge