git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f4a2db
885cf6f
)
Linux-omap rebuilt: Updated to v3.1-rc1 with fixes
author
Tony Lindgren
<tony@atomide.com>
Wed, 10 Aug 2011 11:03:23 +0000
(
04:03
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 10 Aug 2011 11:03:23 +0000
(
04:03
-0700)
$ git checkout -b tmp-rebuild-
1312974171
linus
$ git merge -m "Merge fixes cleanup board testing-misc testing-board cbus" fixes cleanup board testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1312974171
To view the changes since the last rebuild, please do
$ git diff
885cf6ff7d3dad4cc44be74b0577d3a554d3ab71
..
2f4a2db05dfb976b83257898c44147654f2cea89
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1312974171
Trivial merge