Merge branch 'kconfig-text' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:03:39 +0000 (05:03 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:03:39 +0000 (05:03 -0500)
1  2 
drivers/acpi/Kconfig

Simple merge