From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 5 Jul 2012 15:25:34 +0000 (-0700)
Subject: Merge v3.5-rc5 into driver-core-next
X-Git-Tag: firefly_0821_release~3680^2~2355^2~14^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6fbfd0592ef88ba29cdce84ef92757351f1fa9c9;p=firefly-linux-kernel-4.4.55.git

Merge v3.5-rc5 into driver-core-next

This picks up the big printk fixes, and resolves a merge issue with:
	drivers/extcon/extcon_gpio.c

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

6fbfd0592ef88ba29cdce84ef92757351f1fa9c9