Conflicts:
	drivers/platform/x86/eeepc-laptop.c
Signed-off-by: NLen Brown <len.brown@intel.com>