From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 20 Jun 2013 03:26:43 +0000 (-0700)
Subject: Merge branch 'driver-core-linus' into driver-core-next
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~74^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7068cb07563d8f001e83a2836ccf1cef6518aea4;p=pandora-kernel.git

Merge branch 'driver-core-linus' into driver-core-next

This resolves the merge issues with drivers/base/firmware_class.c

Thanks to Ming Lei for the patch and hints on how to resolve it.

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

7068cb07563d8f001e83a2836ccf1cef6518aea4
Reading git-diff-tree failed