git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c3052b
a7be200
)
Linux-omap rebuilt: Updated to -rc7, for-next fixes
author
Tony Lindgren
<tony@atomide.com>
Sat, 14 Nov 2009 01:23:58 +0000
(17:23 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Sat, 14 Nov 2009 01:23:58 +0000
(17:23 -0800)
$ git checkout -b tmp-rebuild-
1258161833
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-
1258161833
To view the changes since the last rebuild, please do
$ git diff
a7be2003d90bfc27ff915531e7949f0ccfb457cd
..
1c3052bd68c79a7ca42b2cb620aeb3adf25f000c
arch/arm/*omap*/
Merge branch 'master' into tmp-rebuild-
1258161833
Trivial merge