Linux-omap rebuilt: Merged hsmmc hwmod changes
authorTony Lindgren <tony@atomide.com>
Tue, 1 Mar 2011 23:07:43 +0000 (15:07 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 1 Mar 2011 23:07:43 +0000 (15:07 -0800)
$ git checkout -b tmp-rebuild-1299020857 linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1299020857

To view the changes since the last rebuild, please do
$ git diff 3d9b3960ff9bc213ab56d31ca0777c605b1dbc87..41ddfc624e9a571240d5709fa37453cb8470e0aa arch/arm/*omap*/


Trivial merge