git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
61cf619
6cd5fb7
)
Linux-omap rebuilt: Updated to -rc4
author
Tony Lindgren
<tony@atomide.com>
Tue, 8 Feb 2011 02:47:51 +0000
(18:47 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 8 Feb 2011 02:47:51 +0000
(18:47 -0800)
$ git checkout -b tmp-rebuild-
1297133262
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-
1297133262
To view the changes since the last rebuild, please do
$ git diff
cdbf562556f2a4e942208b57b132320c78d87292
..
61cf6199ea69a92f49d0847e23fa92186180f665
arch/arm/*omap*/
Trivial merge