Merge branch 'stable/for-x86-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel...
authorLen Brown <len.brown@intel.com>
Thu, 22 Mar 2012 05:31:09 +0000 (01:31 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 22 Mar 2012 05:31:09 +0000 (01:31 -0400)

Trivial merge