Merge branch 'misc-2.6.31' into release
authorLen Brown <len.brown@intel.com>
Sun, 2 Aug 2009 16:55:51 +0000 (12:55 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 2 Aug 2009 16:55:51 +0000 (12:55 -0400)

Trivial merge