git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a1facef
b15127d
)
Linux-omap rebuilt: Updated to -rc2
author
Tony Lindgren
<tony@atomide.com>
Mon, 6 Jun 2011 11:33:28 +0000
(
04:33
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 6 Jun 2011 11:33:28 +0000
(
04:33
-0700)
$ git checkout -b tmp-rebuild-
1307359996
linus
$ git merge -m "Merge devel-fixes devel-board omap-testing cbus testing-i2c" devel-fixes devel-board omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1307359996
To view the changes since the last rebuild, please do
$ git diff
b15127d25086724d538960915148e4bcf12ad7e8
..
a1facefa25ea2a373ce3311ac050595aeed51fd6
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1307359996
Trivial merge