git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f3ce99
8475b9e
)
Linux-omap rebuilt: Updated to -rc4
author
Tony Lindgren
<tony@atomide.com>
Tue, 14 Sep 2010 04:17:04 +0000
(21:17 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 14 Sep 2010 04:17:04 +0000
(21:17 -0700)
$ git checkout -b tmp-rebuild-
1284437791
linus
$ 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 for-next" for-next
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1284437791
To view the changes since the last rebuild, please do
$ git diff
8475b9e5077d9e9b4ba7a92afd4c5c7d65564c09
..
8f3ce997d5b03417baca813da27a34870d78086c
arch/arm/*omap*/
Trivial merge