]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 21 Oct 2008 18:42:20 +0000 (19:42 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Tue, 21 Oct 2008 18:42:20 +0000 (19:42 +0100)
commitb876d08f816527af257e13d89fb0d3b4b849223c
tree40569f568230f918ca55f04b355e251747f913ed
parentb364776ad1208a71f0c53578c84619a395412a8d
parent2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/pci/dmar.c
MAINTAINERS
drivers/pci/dmar.c
drivers/pci/quirks.c