git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d87d773
f2620b7
)
Linux-omap rebuilt: Updated to current mainline with arm-soc merged
author
Tony Lindgren
<tony@atomide.com>
Thu, 3 Nov 2011 01:15:04 +0000
(18:15 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 3 Nov 2011 01:15:04 +0000
(18:15 -0700)
$ git checkout -b tmp-rebuild-
1320282868
linus
$ git merge -m "Merge fixes testing-misc cleanup dt soc board testing-board cbus" fixes testing-misc cleanup dt soc board testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1320282868
To view the changes since the last rebuild, please do
$ git diff
f2620b7a0d84f9fd6a9380aa5fbf33aa0880907b
..
d87d773c51b55adc9f1fcf0b98395c9259224340
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1320282868
Trivial merge