]> nv-tegra.nvidia Code Review - linux-2.6.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)
commitd97c0defba25a959a990f6d4759f43075540832e
tree27dceaf310e01a6bbcceee3550112b19202f142f
parentec9f168fcc344d2ffec1c8c822076bf22dab5c33
parentb4f9fe12157a33351d0df78e925dcacd13252783
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