git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dcadd12
a9025a8
)
Linux-omap rebuilt: Updated to -rc2, dropped io_chain_devel_3.4 until boot issues...
author
Tony Lindgren
<tony@atomide.com>
Mon, 9 Apr 2012 18:05:21 +0000
(11:05 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 9 Apr 2012 18:05:21 +0000
(11:05 -0700)
$ git checkout -b tmp-rebuild-
1333994709
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-
1333994709
To view the changes since the last rebuild, please do
$ git diff
a9025a89d904de3130ec68c9bafc313810ae2ac5
..
dcadd12d26ed3da14bd409b6c5b0688bddc27fa7
arch/arm/*omap*/
Trivial merge