From: Greg Kroah-Hartman Date: Mon, 1 Apr 2013 17:50:58 +0000 (-0700) Subject: Merge v3.9-rc5 into char-misc-next X-Git-Tag: v3.10-rc1~194^2~40 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=974857266aae29c371ac2313ab520616335caec9;p=users%2Fjedix%2Flinux-maple.git Merge v3.9-rc5 into char-misc-next This picks up the fixes in 3.9-rc5 that we need here. Signed-off-by: Greg Kroah-Hartman --- 974857266aae29c371ac2313ab520616335caec9