Linux-omap rebuilt: Updated to v2.6.36, add 24xx uart fix
authorTony Lindgren <tony@atomide.com>
Fri, 22 Oct 2010 18:21:08 +0000 (11:21 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 22 Oct 2010 18:21:08 +0000 (11:21 -0700)
$ git checkout -b tmp-rebuild-1287771655 linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git pull ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git pm-hwmod-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1287771655

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


Trivial merge