Linux-omap rebuilt: Updated to -rc5, merged in timer cleanup
authorTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2011 11:15:57 +0000 (04:15 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 29 Jun 2011 11:15:57 +0000 (04:15 -0700)
$ git checkout -b tmp-rebuild-1309346141 linus
$ git merge -m "Merge devel-fixes devel-cleanup devel-board omap-testing cbus" devel-fixes devel-cleanup 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-1309346141

To view the changes since the last rebuild, please do
$ git diff c3491f46fbdfd50af54b4351c153ac887a66d323..1d59989602fe6cfc7fa14acf2eedc3c6852fe78f arch/arm/*omap*/

Merge branch 'master' into tmp-rebuild-1309346141


Trivial merge