git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
efab3a9
fc786ca
)
Linux-omap rebuilt: Merged in updated omap-fixes
author
Tony Lindgren
<tony@atomide.com>
Sat, 24 Apr 2010 00:41:50 +0000
(17:41 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Sat, 24 Apr 2010 00:41:50 +0000
(17:41 -0700)
$ git checkout -b tmp-rebuild-
1272069694
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-
1272069694
To view the changes since the last rebuild, please do
$ git diff
fc786ca5e0a15dcade6fc2cb51767a58cebc2e59
..
efab3a9cb5f7f96d5f44b0fd7df1b83a928d464d
arch/arm/*omap*/
Trivial merge