git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3f30e05
e10eed9
)
Linux-omap rebuilt: Merged McBSP, board chanages
author
Tony Lindgren
<tony@atomide.com>
Thu, 24 Feb 2011 23:21:49 +0000
(15:21 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 24 Feb 2011 23:21:49 +0000
(15:21 -0800)
$ git checkout -b tmp-rebuild-
1298589703
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-
1298589703
To view the changes since the last rebuild, please do
$ git diff
e10eed954a2525c5d0b6dc361cdcbb46fea69d50
..
3f30e055949d6f40a600ec31fcfb21134c3feb0d
arch/arm/*omap*/
Trivial merge