Merge branch 'panasonic' into test

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

Thu, 23 Oct 2008 03:36:06 +0000 (23:36 -0400)

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

Thu, 23 Oct 2008 03:36:06 +0000 (23:36 -0400)
author Len Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:36:06 +0000 (23:36 -0400)
committer Len Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:36:06 +0000 (23:36 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/misc/Kconfig
Simple merge
author	Len Brown <len.brown@intel.com>
	Thu, 23 Oct 2008 03:36:06 +0000 (23:36 -0400)
committer	Len Brown <len.brown@intel.com>
	Thu, 23 Oct 2008 03:36:06 +0000 (23:36 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history