Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorJesse Barnes <jbarnes@hobbes.lan>
Thu, 12 Jun 2008 19:06:58 +0000 (12:06 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 12 Jun 2008 19:06:58 +0000 (12:06 -0700)
1  2 
MAINTAINERS
drivers/pci/pci-acpi.c
drivers/pci/pci.c
drivers/pci/pci.h

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge