git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94e03d0
903851e
)
Linux-omap rebuilt: Merged in hwspinlock and mcspi changes
author
Tony Lindgren
<tony@atomide.com>
Thu, 10 Feb 2011 03:03:37 +0000
(19:03 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 10 Feb 2011 03:03:37 +0000
(19:03 -0800)
$ git checkout -b tmp-rebuild-
1297307011
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-
1297307011
To view the changes since the last rebuild, please do
$ git diff
5e37885fdb0eb8a2d2ec6999598ed85985816204
..
94e03d0692fe2a7b4e493acd9bf64ed4c8018856
arch/arm/*omap*/
Trivial merge