Linux-omap rebuilt: Updated to -rc6
authorTony Lindgren <tony@atomide.com>
Tue, 5 Jul 2011 11:21:09 +0000 (04:21 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 5 Jul 2011 11:21:09 +0000 (04:21 -0700)
$ git checkout -b tmp-rebuild-1309864855 linus
$ git merge -m "Merge omap-fixes-for-linus devel-cleanup devel-fixes devel-board omap-testing cbus" omap-fixes-for-linus devel-cleanup devel-fixes devel-board omap-testing cbus
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.g for_3.1/i2c-andy
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1309864855

To view the changes since the last rebuild, please do
$ git diff 34f762a30ff76544a03e952baa327660148e5494..f72277696b6dcf70b2ac261d0a14fa82d75c50d4 arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1309864855


Trivial merge