git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
06ea70e
99b109e
)
Linux-omap rebuilt: Fixed n900 booting, merged clock fixes
author
Tony Lindgren
<tony@atomide.com>
Thu, 21 Apr 2011 13:15:19 +0000
(06:15 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 21 Apr 2011 13:15:19 +0000
(06:15 -0700)
$ git checkout -b tmp-rebuild-
1303391710
linus
$ git merge -m "Merge for-next omap-testing cbus testing-i2c" for-next omap-testing cbus testing-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1303391710
To view the changes since the last rebuild, please do
$ git diff
99b109edbbe2219cbe1d15c720f0c26104236220
..
06ea70ed111c8873620904490cd41f5c23956c5f
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1303391710
Trivial merge