Merge branch 'linus' into test (057316cc) · Commits · hpc / Old_Soft / kernel

Commit 057316cc authored Oct 22, 2008 by

Len Brown

Merge branch 'linus' into test



Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>

parents 3e2dab9a 2515ddc6

Expand all Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment