git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
43a6821
eba0147
)
Linux-omap rebuilt: Updated to -rc5
author
Tony Lindgren
<tony@atomide.com>
Tue, 20 Apr 2010 00:46:10 +0000
(17:46 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 20 Apr 2010 00:46:10 +0000
(17:46 -0700)
$ git checkout -b tmp-rebuild-
1271724358
linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1271724358
To view the changes since the last rebuild, please do
$ git diff
eba014745cc806d625b6a553d1af6efd14e16321
..
43a6821213e191cef6cfdcafc0884593fbc32764
arch/arm/*omap*/
Trivial merge