git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bfb0fe1
ee2dd3c
)
Linux-omap rebuilt: Updated to -rc2, merged in fixes and cleanup
author
Tony Lindgren
<tony@atomide.com>
Thu, 25 Oct 2012 19:59:29 +0000
(12:59 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 25 Oct 2012 19:59:29 +0000
(12:59 -0700)
$ git checkout -b tmp-rebuild-
1351195163
linus
$ git merge -m "Merge omap-for-v3.8/tmp-merge omap-for-v3.8/tmp-testing-misc omap-for-v3.8/tmp-testing-board" omap-for-v3.8/tmp-merge omap-for-v3.8/tmp-testing-misc omap-for-v3.8/tmp-testing-board
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1351195163
To view the changes since the last rebuild, please do
$ git diff
ee2dd3c4b098bf649653dd46136eaf4a4e86c34c
..
bfb0fe1cee3026a3370a726345c731ac55cb17ab
arch/arm/*omap*/
Trivial merge