From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 2 May 2012 21:33:37 +0000 (-0700)
Subject: Merge 3.4-rc5 into driver-core-next
X-Git-Tag: v3.5-rc1~147^2~47
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb1574270a6de8fb8d31ffc3b021e30df0afcda3;p=pandora-kernel.git

Merge 3.4-rc5 into driver-core-next

This was done to resolve a merge issue with the init/main.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

eb1574270a6de8fb8d31ffc3b021e30df0afcda3
Reading git-diff-tree failed