Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2
authorBen Dooks <ben-linux@fluff.org>
Tue, 1 Nov 2011 00:52:53 +0000 (00:52 +0000)
committerBen Dooks <ben-linux@fluff.org>
Tue, 1 Nov 2011 00:52:53 +0000 (00:52 +0000)
commitbe4af5dfa6d976ba579bae16ff8714b755d44dad
treeedecd9bd4757a4fe7bdf4dc13e087d6a174fdc12
parentce0fda16084905d035e8ceb51cf42740ad781b15
parent4311051c358ad0e66b68934e7a33cf10ba533466
Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2

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

Fixed up merge conflic