git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
df865f0
06d9e4f
)
Linux-omap rebuilt: TWL rename patches merged
author
Tony Lindgren
<tony@atomide.com>
Tue, 15 Dec 2009 21:51:38 +0000
(13:51 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 15 Dec 2009 21:51:38 +0000
(13:51 -0800)
$ git checkout -b tmp-rebuild-
1260913890
linus
$ git merge -m "Merge omap-fixes" omap-fixes
$ 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-
1260913890
To view the changes since the last rebuild, please do
$ git diff
06d9e4fdd20e9afb82cb588157b10d2a2ec41a5c
..
df865f0dba861a84c4d6a23ea0ead79f00d0dda8
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1260913890
Trivial merge