From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 29 Jul 2013 18:50:17 +0000 (-0700)
Subject: Merge 3.11-rc3 into char-misc-next.
X-Git-Tag: v3.12-rc1~185^2~33
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c5891bd4342349a200676d33f742dd1b864822c;p=pandora-kernel.git

Merge 3.11-rc3 into char-misc-next.

This resolves a merge issue with:
	drivers/misc/mei/init.c

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

9c5891bd4342349a200676d33f742dd1b864822c
Reading git-diff-tree failed