git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a1288d1
e879054
)
Linux-omap rebuilt: Updated to -rc7, merged PM core and OPP branches
author
Tony Lindgren
<tony@atomide.com>
Wed, 22 Dec 2010 01:32:43 +0000
(17:32 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 22 Dec 2010 01:32:43 +0000
(17:32 -0800)
$ git checkout -b tmp-rebuild-
1292981503
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-
1292981503
To view the changes since the last rebuild, please do
$ git diff
e8790546b376d9d77c541f8c17acb080e7342467
..
a1288d1b8a3c04e77fd1164ecfbe6d76cf0399f1
arch/arm/*omap*/
Trivial merge