git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e6cca94
0ef74b7
)
Linux-omap rebuilt: Updated to 2.6.33-rc5
author
Tony Lindgren
<tony@atomide.com>
Fri, 22 Jan 2010 02:36:57 +0000
(18:36 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 22 Jan 2010 02:36:57 +0000
(18:36 -0800)
$ git checkout -b tmp-rebuild-
1264127809
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-
1264127809
To view the changes since the last rebuild, please do
$ git diff
0ef74b74ff3ec1d3ae3f54b0833fb0235edf9269
..
e6cca94a3251855111d406935bf2347d7ff4e58a
arch/arm/*omap*/
Trivial merge