From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Jun 2013 18:54:25 +0000 (-0700)
Subject: Merge 3.10-rc6 into char-misc-next
X-Git-Tag: v3.11-rc1~157^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e496b8e84410c96d1ffc86f0b37b0328a4234da;p=thirdparty%2Flinux.git

Merge 3.10-rc6 into char-misc-next

We want the fixes in here.
---

0e496b8e84410c96d1ffc86f0b37b0328a4234da