git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d36e3e
1e32b7e
)
Linux-omap rebuilt: Updated to -rc5
author
Tony Lindgren
<tony@atomide.com>
Mon, 30 Apr 2012 17:17:58 +0000
(10:17 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 30 Apr 2012 17:17:58 +0000
(10:17 -0700)
$ git checkout -b tmp-rebuild-
1335806266
linus
$ git merge -m "Merge fixes fixes-non-critical tmp-merge testing-misc testing-board cbus" fixes fixes-non-critical tmp-merge testing-misc testing-board cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1335806266
To view the changes since the last rebuild, please do
$ git diff
1e32b7eeeb5d0ab28dd55a5b3be2d88409beffc8
..
9d36e3e5b20331c07cf6a876d49d547842eb98b2
arch/arm/*omap*/
Trivial merge