git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
21b5c77
4391946
)
Linux-omap rebuilt: Updated to -rc5, merged in ti816x support and other patches
author
Tony Lindgren
<tony@atomide.com>
Thu, 17 Feb 2011 00:31:17 +0000
(16:31 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 17 Feb 2011 00:31:17 +0000
(16:31 -0800)
$ git checkout -b tmp-rebuild-
1297902671
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-
1297902671
To view the changes since the last rebuild, please do
$ git diff
43919468ec86d3a287a1d4dc84b481a38055aa5b
..
21b5c7717cfaca413ff63332d210996d9c016be9
arch/arm/*omap*/
Trivial merge