aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/pci_irq.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 03:38:22 -0500
committerLen Brown <len.brown@intel.com>2008-02-07 03:38:22 -0500
commita733a5da97b238e3e3167d3d0aee8fe1e8d04e97 (patch)
tree944bd894e77db00c1d30cd252614ac93c6c6bea5 /drivers/acpi/pci_irq.c
parent299cfe38081bea6dcd8b882375f6f65a980bccf9 (diff)
parent299cfe38081bea6dcd8b882375f6f65a980bccf9 (diff)
parent9e52797131e83688f66fbca6d4cd25b83f33c48f (diff)
downloadlinux-linaro-stable-a733a5da97b238e3e3167d3d0aee8fe1e8d04e97.tar.gz
Merge branches 'release' and 'fluff' into release
Conflicts: drivers/acpi/scan.c include/linux/acpi.h Signed-off-by: Len Brown <len.brown@intel.com>