git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7082007
7b6b2e8
)
Linux-omap rebuilt: Updated to -rc8
author
Tony Lindgren
<tony@atomide.com>
Thu, 30 Dec 2010 18:44:40 +0000
(10:44 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 30 Dec 2010 18:44:40 +0000
(10:44 -0800)
$ git checkout -b tmp-rebuild-
1293734673
linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1293734673
To view the changes since the last rebuild, please do
$ git diff
7b6b2e84ada1eca268eac17a90f93fc6145f6146
..
708200726ee5cd4ebf38a6e379fed679244afaa3
arch/arm/*omap*/
Trivial merge