From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Jun 2013 23:57:20 +0000 (-0700)
Subject: Merge 3.10-rc6 into driver-core-next
X-Git-Tag: v3.11-rc1~156^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bb07b00be77fb33274cb44a03bdbf2471e556189;p=users%2Fjedix%2Flinux-maple.git

Merge 3.10-rc6 into driver-core-next

We want these fixes here too.

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

bb07b00be77fb33274cb44a03bdbf2471e556189