Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorSean Hefty <sean.hefty@intel.com>
Tue, 22 Jan 2013 00:06:42 +0000 (16:06 -0800)
committerSean Hefty <sean.hefty@intel.com>
Tue, 22 Jan 2013 00:06:42 +0000 (16:06 -0800)

Trivial merge