git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f5b42ab
301f2e0
)
Linux-omap rebuilt: updated to -rc8
author
Tony Lindgren
<tony@atomide.com>
Fri, 12 Feb 2010 23:00:51 +0000
(15:00 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 12 Feb 2010 23:00:51 +0000
(15:00 -0800)
$ git checkout -b tmp-rebuild-
1266015644
linus
$ 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-
1266015644
To view the changes since the last rebuild, please do
$ git diff
301f2e037b161c79bf12f4194501c9ff9c12ced3
..
f5b42ab275a49d96861e76265b60114b169af7aa
arch/arm/*omap*/
Trivial merge