Merge branch 'sony-laptop' into release

author Len Brown <len.brown@intel.com>

Sun, 5 Apr 2009 05:42:14 +0000 (01:42 -0400)

committer Len Brown <len.brown@intel.com>

Sun, 5 Apr 2009 05:42:14 +0000 (01:42 -0400)
author Len Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:42:14 +0000 (01:42 -0400)
committer Len Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:42:14 +0000 (01:42 -0400)
diff --cc drivers/platform/x86/Kconfig
Simple merge
author	Len Brown <len.brown@intel.com>
	Sun, 5 Apr 2009 05:42:14 +0000 (01:42 -0400)
committer	Len Brown <len.brown@intel.com>
	Sun, 5 Apr 2009 05:42:14 +0000 (01:42 -0400)