git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e0efa1
03de53b
)
Linux-omap rebuilt: Updated to -rc3, merged in fixes
author
Tony Lindgren
<tony@atomide.com>
Tue, 17 Apr 2012 21:08:21 +0000
(14:08 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 17 Apr 2012 21:08:21 +0000
(14:08 -0700)
$ git checkout -b tmp-rebuild-
1334696888
linus
$ git merge -m "Merge fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus" fixes fixes-non-critical tmp-merge dt testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1334696888
To view the changes since the last rebuild, please do
$ git diff
03de53be8a7db6f346b3cb7f6e41ff09e5af6b19
..
6e0efa1587c9f0f97596a52847f2685de9083e4a
arch/arm/*omap*/
Trivial merge