From: Ben Dooks <ben-linux@fluff.org>
Date: Tue, 1 Nov 2011 00:52:53 +0000 (+0000)
Subject: Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2
X-Git-Tag: firefly_0821_release~3680^2~4244^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=be4af5dfa6d976ba579bae16ff8714b755d44dad;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2

Conflicts:
	drivers/i2c/busses/i2c-designware-core.c

Fixed up merge conflic
---

be4af5dfa6d976ba579bae16ff8714b755d44dad