git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c3e7ec7
732b7cd
)
Linux-omap rebuilt: for-next updated and pm branch merged
author
Tony Lindgren
<tony@atomide.com>
Wed, 24 Feb 2010 03:53:34 +0000
(19:53 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 24 Feb 2010 03:53:34 +0000
(19:53 -0800)
$ git checkout -b tmp-rebuild-
1266983604
linus
$ git merge -m "Merge omap-testing" omap-testing
$ git merge -m "Merge for-next" for-next
$ git merge -m "Merge cbus" cbus
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1266983604
To view the changes since the last rebuild, please do
$ git diff
732b7cdf5da34e4862213aa24e9a38f5c1621c5b
..
c3e7ec7dce27c4de8896b1cb23d232ad3a630404
arch/arm/*omap*/
Trivial merge