git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5e090ed
c0a2203
)
Linux-omap rebuilt: Reset to mainline
author
Tony Lindgren
<tony@atomide.com>
Tue, 9 Oct 2012 03:14:45 +0000
(20:14 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 9 Oct 2012 03:14:45 +0000
(20:14 -0700)
$ git checkout -b tmp-rebuild-
1349752479
linus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1349752479
To view the changes since the last rebuild, please do
$ git diff
c0a22032e9c8eeb6521ab4471dac1a2bb74d088e
..
5e090ed7af10729a396a25df43d69a236e789736
arch/arm/*omap*/
Trivial merge