git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
572bca6
0cf12e3
)
Linux-omap rebuilt: for-next updated
author
Tony Lindgren
<tony@atomide.com>
Wed, 18 Nov 2009 00:01:14 +0000
(16:01 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 18 Nov 2009 00:01:14 +0000
(16:01 -0800)
$ git checkout -b tmp-rebuild-
1258502467
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-
1258502467
To view the changes since the last rebuild, please do
$ git diff
0cf12e3ce3358f9a282244e0fd65af20cca38bba
..
572bca6b75f8559db22e934dfd287be775e0f615
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1258502467
Trivial merge