git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e918d4f
c3662bf
)
Linux-omap rebuilt: Updated with final patches for v3.6 merge window
author
Tony Lindgren
<tony@atomide.com>
Tue, 10 Jul 2012 08:13:19 +0000
(
01:13
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 10 Jul 2012 08:13:19 +0000
(
01:13
-0700)
$ git checkout -b tmp-rebuild-
1341907986
linus
$ git merge -m "Merge fixes fixes-non-critical testing-misc tmp-merge testing-board cbus" fixes fixes-non-critical testing-misc tmp-merge testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1341907986
To view the changes since the last rebuild, please do
$ git diff
c3662bf17922301ea80aa301c38cf9a64e68d656
..
e918d4f4ef66026f176940da7a4e82b43216e089
arch/arm/*omap*/
Trivial merge