Linux-omap rebuilt: Added LMB patches into omap-testing
authorTony Lindgren <tony@atomide.com>
Thu, 13 May 2010 23:36:39 +0000 (16:36 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 13 May 2010 23:36:39 +0000 (16:36 -0700)
$ git checkout -b tmp-rebuild-1273793782 linus
$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git gpio-2.6.35
$ git merge -m "Merge cbus" cbus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge i2c-omap-for-ben" i2c-omap-for-ben
$ git merge -m "Merge for-next" for-next
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-1273793782

To view the changes since the last rebuild, please do
$ git diff 6fced9dfdc7e51c8bf5409ee2f20190336ace3be..32f3331c54fb642f9e596368428eb81122e9e3df arch/arm/*omap*/


Trivial merge