Linux-omap rebuilt: Merged fixes-part2, updated testing-misc with DT append
authorTony Lindgren <tony@atomide.com>
Thu, 6 Oct 2011 23:58:11 +0000 (16:58 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 6 Oct 2011 23:58:11 +0000 (16:58 -0700)
$ git checkout -b tmp-rebuild-1317945478 linus
$ git merge -m "Merge fixes-part2 dt-merge soc board testing-board" fixes-part2 dt-merge soc board testing-board
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1317945478

To view the changes since the last rebuild, please do
$ git diff b582dcf16ba63cd7ad2e5cd00ebf36fc72257513..0bf77c61220622695527aaac335a31b3bea0b8b5 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1317945478


Trivial merge