git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
30b42fb
d4f02b1
)
Linux-omap rebuilt: Updated to -rc3, merged init_early cleanup
author
Tony Lindgren
<tony@atomide.com>
Wed, 24 Aug 2011 12:02:31 +0000
(
05:02
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 24 Aug 2011 12:02:31 +0000
(
05:02
-0700)
$ git checkout -b tmp-rebuild-
1314187340
linus
$ git merge -m "Merge fixes cleanup board testing-misc testing-board cbus" fixes cleanup board testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1314187340
To view the changes since the last rebuild, please do
$ git diff
d4f02b12e9cf9b443ee07b97245d8e8515d84029
..
30b42fb4906df8db64f23c42fd7ca9120a14ee1b
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1314187340
Trivial merge