]> git.baikalelectronics.ru Git - 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)
commit36aa8b19c719ce0023ff90bbb01d92da64e3a2ac
tree40569f568230f918ca55f04b355e251747f913ed
parentc58b67da7acdf239540e8565524164433987a2f1
parentfe00b7ac5d354d23437846c1b3ee6193c64191cb
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