]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2b6fb654fd3dd0980085921a07a0ba2522bc14e2
treeedecd9bd4757a4fe7bdf4dc13e087d6a174fdc12
parent3083c2fe2b9a3f8bcbd287591040d6904c74192c
parentd6e60df0e8c5997d79f4e4e86088eca684f71842
Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2

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

Fixed up merge conflic