Linux-omap rebuilt: Updated devel-board merged
authorTony Lindgren <tony@atomide.com>
Mon, 4 Jul 2011 11:48:28 +0000 (04:48 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 4 Jul 2011 11:48:28 +0000 (04:48 -0700)
$ git checkout -b tmp-rebuild-1309780092 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-1309780092

To view the changes since the last rebuild, please do
$ git diff d9be6df1331f8078618745298d38ed619729ec91..d3747c67e054f79c1dc32418933f556aa963d2bf arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1309780092


Trivial merge