]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 299cfe3 299cfe3 9e52797)
Merge branches 'release' and 'fluff' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:38:22 +0000 (03:38 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:38:22 +0000 (03:38 -0500)
commita733a5da97b238e3e3167d3d0aee8fe1e8d04e97
tree944bd894e77db00c1d30cd252614ac93c6c6bea5tree | snapshot
parent299cfe38081bea6dcd8b882375f6f65a980bccf9commit | diff
parent299cfe38081bea6dcd8b882375f6f65a980bccf9commit | diff
parent9e52797131e83688f66fbca6d4cd25b83f33c48fcommit | diff
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>
arch/ia64/kernel/acpi.c diff1 | diff2 | diff3 | blob | history
arch/x86/kernel/acpi/boot.c diff1 | diff2 | diff3 | blob | history
drivers/acpi/Kconfig diff1 | diff2 | diff3 | blob | history
drivers/acpi/bay.c diff1 | diff2 | diff3 | blob | history
drivers/acpi/bus.c diff1 | diff2 | diff3 | blob | history
drivers/acpi/dock.c diff1 | diff2 | diff3 | blob | history
drivers/acpi/osl.c diff1 | diff2 | diff3 | blob | history
drivers/acpi/pci_irq.c diff1 | diff2 | diff3 | blob | history
drivers/acpi/scan.c diff1 | diff2 | diff3 | blob | history
include/acpi/acpi_drivers.h diff1 | diff2 | diff3 | blob | history
include/linux/acpi.h diff1 | diff2 | diff3 | blob | history
Unnamed repository; edit this file 'description' to name the repository.