From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Jul 2013 14:40:10 +0000 (-0700)
Subject: Merge 3.11-rc3 into staging-next
X-Git-Tag: v3.12-rc1~183^2~488
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=01731cf2eee38410b505c447026e46a591674835;p=users%2Fdwmw2%2Flinux.git

Merge 3.11-rc3 into staging-next

We want these fixes here.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

01731cf2eee38410b505c447026e46a591674835