git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
784bee8
8973a21
)
Linux-omap rebuilt: Updated to -rc3
author
Tony Lindgren
<tony@atomide.com>
Wed, 24 Nov 2010 01:32:33 +0000
(17:32 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 24 Nov 2010 01:32:33 +0000
(17:32 -0800)
$ git checkout -b tmp-rebuild-
1290562339
linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1290562339
To view the changes since the last rebuild, please do
$ git diff
8973a21e18241081d16693504d7c0ed5b9918716
..
784bee8e737e137feebd3c0db3e5b611b8a580b1
arch/arm/*omap*/
Trivial merge