git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a0aed8
a83d12a
)
Linux-omap rebuilt: Updated to v2.6.37-rc1
author
Tony Lindgren
<tony@atomide.com>
Mon, 1 Nov 2010 17:48:47 +0000
(10:48 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 1 Nov 2010 17:48:47 +0000
(10:48 -0700)
$ git checkout -b tmp-rebuild-
1288633712
linus
$ git merge -m "Merge for-next omap-testing cbus" for-next omap-testing cbus
$ git pull ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git pm-hwmod-i2c
$ git merge -s ours master
$ git checkout master
$ git merge tmp-rebuild-
1288633712
To view the changes since the last rebuild, please do
$ git diff
a83d12a47c9a8c78a184910150797045d69a1570
..
7a0aed8f6bed2e52a52d442a0e167e97d867d34c
arch/arm/*omap*/
Trivial merge