git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b524aee
74afe82
)
Linux-omap rebuilt: Updated to -rc2
author
Tony Lindgren
<tony@atomide.com>
Mon, 11 Apr 2011 10:00:07 +0000
(
03:00
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 11 Apr 2011 10:00:07 +0000
(
03:00
-0700)
$ git checkout -b tmp-rebuild-
1302515998
linus
$ git merge -m "Merge for-next omap-testing cbus testing-i2c" for-next omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1302515998
To view the changes since the last rebuild, please do
$ git diff
74afe82d7b678af93e84cf72f8f8027b8e33c8e2
..
b524aee9f627281668c7072a3e3883d12d7c1e12
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1302515998
Trivial merge