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)
commit53eb2fbeb9e68e1a9a23945de8450999c46270ce
tree3c50f8690f63b53b3cffbcc226cbbe3c8c6de753
parent8344b568f5bdc7ee1bba909de3294c6348c36056
parent0e6859d49ff194e01afc229c996e3aefca1a0539
Merge branch 'suspend' of git://git./linux/kernel/git/lenb/linux-acpi-2.6 into linux-next
MAINTAINERS
drivers/pci/pci-acpi.c
drivers/pci/pci.c
drivers/pci/pci.h