From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 13 Jul 2014 22:26:47 +0000 (-0700)
Subject: Merge 3.16-rc5 into char-misc-next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~168^2~17
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f48c89862e39b7f33b44123fc425cf901c89428;p=pandora-kernel.git

Merge 3.16-rc5 into char-misc-next

This resolves a number of merge issues with changes in this tree and
Linus's tree at the same time.

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

9f48c89862e39b7f33b44123fc425cf901c89428
Reading git-diff-tree failed