git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ce46337
a4e62fa
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:49:07 +0000
(21:49 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:49:07 +0000
(21:49 -0800)
Manual fixups for some clashes due to re-indenting.
Trivial merge