git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6503cad
5f1be21
)
Linux-omap rebuilt: Updated to v2.6.38, merged omap-for-linus, merged fixes
author
Tony Lindgren
<tony@atomide.com>
Mon, 21 Mar 2011 15:33:26 +0000
(08:33 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 21 Mar 2011 15:33:26 +0000
(08:33 -0700)
$ git checkout -b tmp-rebuild-
1300721502
linus
$ git merge -m "Merge omap-for-linus devel-fixes for-next omap-testing cbus testing-i2c" omap-for-linus devel-fixes for-next omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1300721502
To view the changes since the last rebuild, please do
$ git diff
521cb40b0c44418a4fd36dc633f575813d59a43d
..
6503cade73cec91b9c023d30970fba11608c83b7
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1300721502
Trivial merge