Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

author Jesse Barnes <jbarnes@hobbes.lan>

Thu, 12 Jun 2008 19:06:58 +0000 (12:06 -0700)

committer Jesse Barnes <jbarnes@virtuousgeek.org>

Thu, 12 Jun 2008 19:06:58 +0000 (12:06 -0700)
author Jesse Barnes <jbarnes@hobbes.lan>
Thu, 12 Jun 2008 19:06:58 +0000 (12:06 -0700)
committer Jesse Barnes <jbarnes@virtuousgeek.org>
Thu, 12 Jun 2008 19:06:58 +0000 (12:06 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/pci/pci-acpi.c
Simple merge
diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/pci.h
Simple merge
author	Jesse Barnes <jbarnes@hobbes.lan>
	Thu, 12 Jun 2008 19:06:58 +0000 (12:06 -0700)
committer	Jesse Barnes <jbarnes@virtuousgeek.org>
	Thu, 12 Jun 2008 19:06:58 +0000 (12:06 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci-acpi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history