git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6da0b38
6c8909b
)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
author
David Woodhouse
<David.Woodhouse@intel.com>
Mon, 20 Oct 2008 19:16:53 +0000
(20:16 +0100)
committer
David Woodhouse
<David.Woodhouse@intel.com>
Mon, 20 Oct 2008 19:19:36 +0000
(20:19 +0100)
Conflicts:
drivers/pci/intel-iommu.c
Trivial merge