git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ee417bb
568a9be
)
Linux-omap rebuilt: omap-fixes merged into mainline
author
Tony Lindgren
<tony@atomide.com>
Tue, 12 Jan 2010 01:23:55 +0000
(17:23 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 12 Jan 2010 01:23:55 +0000
(17:23 -0800)
$ git checkout -b tmp-rebuild-
1263259427
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-
1263259427
To view the changes since the last rebuild, please do
$ git diff
568a9be93b1af122126b01fc57f66856228d6f81
..
ee417bb24bcc9a1c5730d8ee10e8717afd41b5e2
arch/arm/*omap*/
Trivial merge