git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0e0bb7f
c48807a
)
Linux-omap rebuilt: omap-fixes merged to mainline
author
Tony Lindgren
<tony@atomide.com>
Tue, 26 Jan 2010 03:48:35 +0000
(19:48 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 26 Jan 2010 03:48:35 +0000
(19:48 -0800)
$ git checkout -b tmp-rebuild-
1264477604
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-
1264477604
To view the changes since the last rebuild, please do
$ git diff
c48807a26251343c3e8f24d1a42cb024e5584a86
..
0e0bb7f4c064aee30d0cdeff784f064cd9fdc6a0
arch/arm/*omap*/
Trivial merge