git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
62365da
27faf5b
)
Linux-omap rebuilt: Updated to -rc8, merged l3 fixes
author
Tony Lindgren
<tony@atomide.com>
Wed, 28 Sep 2011 22:03:49 +0000
(15:03 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 28 Sep 2011 22:03:49 +0000
(15:03 -0700)
$ git checkout -b tmp-rebuild-
1317247405
linus
$ git merge -m "Merge fixes cleanup voltage dmtimer l3 board testing-misc testing-board cbus" fixes cleanup voltage dmtimer l3 board testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1317247405
To view the changes since the last rebuild, please do
$ git diff
27faf5b708fe9e94b08c689c7843f14a720914dd
..
62365da70854af1753f20ba2527f71c5aa1f9c8f
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1317247405
Trivial merge