git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
adf8a28
1f1332f
)
Merge ../linus
author
Dave Jones
<davej@redhat.com>
Thu, 29 Jun 2006 20:01:54 +0000
(16:01 -0400)
committer
Dave Jones
<davej@redhat.com>
Thu, 29 Jun 2006 20:01:54 +0000
(16:01 -0400)
Conflicts:
drivers/char/agp/Kconfig
Trivial merge