git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0e2d0b5
670e35d
)
Linux-omap rebuilt: fixes merged for cpu detection
author
Tony Lindgren
<tony@atomide.com>
Wed, 20 Jan 2010 02:20:18 +0000
(18:20 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 20 Jan 2010 02:20:18 +0000
(18:20 -0800)
$ git checkout -b tmp-rebuild-
1263954011
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-
1263954011
To view the changes since the last rebuild, please do
$ git diff
670e35de2586c06463c59ba9bfdcfac2d28cbece
..
0e2d0b5fc3510552f15c4108d2db328f54c74356
arch/arm/*omap*/
Trivial merge