git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e04178c
5f0079a
)
Linux-omap rebuilt: updated to v2.6.33-rc3, applied some fixes
author
Tony Lindgren
<tony@atomide.com>
Wed, 6 Jan 2010 01:19:18 +0000
(17:19 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 6 Jan 2010 01:19:18 +0000
(17:19 -0800)
$ git checkout -b tmp-rebuild-
1262740750
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-
1262740750
To view the changes since the last rebuild, please do
$ git diff
5f0079aac916940f3a93de68c2409fcb2fe3731e
..
e04178cab0997b293fd80b712e44c7901d0cedb6
arch/arm/*omap*/
Trivial merge