Merge branch 'linus' into idle-test
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 23:06:06 +0000 (18:06 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 23:06:06 +0000 (18:06 -0500)

Trivial merge