git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
34a7347
49aae86
)
Linux-omap rebuilt: Updated to -rc6
author
Tony Lindgren
<tony@atomide.com>
Fri, 17 Dec 2010 00:22:27 +0000
(16:22 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 17 Dec 2010 00:22:27 +0000
(16:22 -0800)
$ git checkout -b tmp-rebuild-
1292545203
linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git pull git://gitorious.org/usb/usb.git musb-hw
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1292545203
To view the changes since the last rebuild, please do
$ git diff
49aae860095a3378415d90aae568ff5e8e60d071
..
34a734742c8e91ff90e0cbb32291a948064436b0
arch/arm/*omap*/
Trivial merge