From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 9 Aug 2015 23:28:09 +0000 (-0700)
Subject: Merge 4.2-rc6 into char-misc-next
X-Git-Tag: omap-for-v4.3/fixes-merge-window~46^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d44f4b3484e85c8d4527ecaca5e536da774ae21;p=pandora-kernel.git

Merge 4.2-rc6 into char-misc-next

We want the fixes in Linus's tree in here as well.

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

5d44f4b3484e85c8d4527ecaca5e536da774ae21
Reading git-diff-tree failed