Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux master
authorSean Hefty <sean.hefty@intel.com>
Thu, 2 May 2013 18:39:53 +0000 (11:39 -0700)
committerSean Hefty <sean.hefty@intel.com>
Thu, 2 May 2013 18:39:53 +0000 (11:39 -0700)

Trivial merge