git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d3dd136
eeafae6
)
Linux-omap rebuilt: Updated to -rc8
author
Tony Lindgren
<tony@atomide.com>
Tue, 8 Mar 2011 23:41:18 +0000
(15:41 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 8 Mar 2011 23:41:18 +0000
(15:41 -0800)
$ git checkout -b tmp-rebuild-
1299627671
linus
$ git merge -m "Merge for-next omap-testing cbus testing-i2c" for-next omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1299627671
To view the changes since the last rebuild, please do
$ git diff
eeafae6dee6a408a6c5aaf9d3862a79eefbb71b0
..
d3dd136cbdc95f64287c075480ddd48f6d2ce562
arch/arm/*omap*/
Trivial merge