Merge 3.7-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Nov 2012 02:28:26 +0000 (18:28 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Nov 2012 02:28:26 +0000 (18:28 -0800)

Trivial merge