git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9b8d1c1
1ae5c1a
)
Linux-omap rebuilt: various fixes merged for testing, some for-next patches
author
Tony Lindgren
<tony@atomide.com>
Thu, 7 Jan 2010 01:31:30 +0000
(17:31 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 7 Jan 2010 01:31:30 +0000
(17:31 -0800)
$ git checkout -b tmp-rebuild-
1262827882
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-
1262827882
To view the changes since the last rebuild, please do
$ git diff
1ae5c1a259fdfdd736a6f9986336f71911f4918b
..
9b8d1c122b68a3c47b6c450d8385292fb5648b15
arch/arm/*omap*/
Trivial merge