git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
787d74a
063d907
)
Linux-omap rebuilt: Updated to -rc4
author
Tony Lindgren
<tony@atomide.com>
Tue, 30 Nov 2010 23:04:23 +0000
(15:04 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 30 Nov 2010 23:04:23 +0000
(15:04 -0800)
$ git checkout -b tmp-rebuild-
1291158244
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-
1291158244
To view the changes since the last rebuild, please do
$ git diff
063d907edaf3fbf9776c189c3e02f2c7a129d18c
..
787d74a8841541b9fcb5b67ff758e27cc5dc4a77
arch/arm/*omap*/
Trivial merge