Merge branch 'fix-smsc911x-regulator' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 01:20:32 +0000 (17:20 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Mar 2012 01:20:32 +0000 (17:20 -0800)

Trivial merge