git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0164507
340cc2b
)
Linux-omap rebuilt: Updated to -rc1, first set of omap-fixes merged
author
Tony Lindgren
<tony@atomide.com>
Fri, 18 Dec 2009 02:51:50 +0000
(18:51 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 18 Dec 2009 02:51:50 +0000
(18:51 -0800)
$ git checkout -b tmp-rebuild-
1261104699
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-
1261104699
To view the changes since the last rebuild, please do
$ git diff
340cc2b922219239d585da55effca94d363648fa
..
0164507276dd5ee1f9ab8fac2f1d123a74987308
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1261104699
Trivial merge