From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 Aug 2012 16:09:07 +0000 (-0700)
Subject: Merge v3.6-rc3 into 'char-misc-next'
X-Git-Tag: firefly_0821_release~3680^2~1979^2~23
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7da59d2fe30d8169c7c9e7b488beb1b9af932608;p=firefly-linux-kernel-4.4.55.git

Merge v3.6-rc3 into 'char-misc-next'

This resolves a conflict in:
	drivers/misc/mei/interrupt.c

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

7da59d2fe30d8169c7c9e7b488beb1b9af932608