Pull sony into release branch

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

Sat, 17 Feb 2007 03:10:55 +0000 (22:10 -0500)

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

Sat, 17 Feb 2007 03:10:55 +0000 (22:10 -0500)
author Len Brown <len.brown@intel.com>
Sat, 17 Feb 2007 03:10:55 +0000 (22:10 -0500)
committer Len Brown <len.brown@intel.com>
Sat, 17 Feb 2007 03:10:55 +0000 (22:10 -0500)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/misc/Kconfig
Simple merge
diff --cc drivers/misc/Makefile
Simple merge
author	Len Brown <len.brown@intel.com>
	Sat, 17 Feb 2007 03:10:55 +0000 (22:10 -0500)
committer	Len Brown <len.brown@intel.com>
	Sat, 17 Feb 2007 03:10:55 +0000 (22:10 -0500)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history