git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f84bd29
6d1ee32
)
Linux-omap rebuilt: updated to -rc4
author
Tony Lindgren
<tony@atomide.com>
Thu, 14 Jan 2010 02:11:01 +0000
(18:11 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 14 Jan 2010 02:11:01 +0000
(18:11 -0800)
$ git checkout -b tmp-rebuild-
1263435052
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-
1263435052
To view the changes since the last rebuild, please do
$ git diff
6d1ee3221f2f1125298a92b77e815556bc11c24f
..
f84bd29c74be5f6fa2dafb2aca8f4dba918d5da8
arch/arm/*omap*/
Trivial merge