]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'drivers-platform' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 09:01:26 +0000 (04:01 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 09:56:56 +0000 (04:56 -0500)
commit4c4bef89c06d546d8ffffc9ef27824adef082e72
tree27dceaf310e01a6bbcceee3550112b19202f142f
parent98b8797b496e1cc9ee04a5de38e24212c91a9cc6
parent66c99a70e34f9adedc1e70de25a164404d0195e6
Merge branch 'drivers-platform' into release

Conflicts:
drivers/misc/Kconfig

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/Makefile
drivers/acpi/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/platform/x86/Kconfig
drivers/platform/x86/fujitsu-laptop.c
drivers/platform/x86/panasonic-laptop.c
drivers/platform/x86/sony-laptop.c
drivers/platform/x86/tc1100-wmi.c
drivers/platform/x86/thinkpad_acpi.c