git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f306749
a04fd22
)
Linux-omap rebuilt: Merged omap1_defconfig related patches for testing, updated to...
author
Tony Lindgren
<tony@atomide.com>
Wed, 8 Dec 2010 04:01:50 +0000
(20:01 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 8 Dec 2010 04:01:50 +0000
(20:01 -0800)
$ git checkout -b tmp-rebuild-
1291780857
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-
1291780857
To view the changes since the last rebuild, please do
$ git diff
a04fd22204b13ce34a3f8a8157f83c44d64f8da9
..
f306749fced39b0c71d191ca53a1d4350477df64
arch/arm/*omap*/
Trivial merge