| commit | be4af5dfa6d976ba579bae16ff8714b755d44dad | [log] [tgz] |
|---|---|---|
| author | Ben Dooks <ben-linux@fluff.org> | Tue Nov 01 00:52:53 2011 +0000 |
| committer | Ben Dooks <ben-linux@fluff.org> | Tue Nov 01 00:52:53 2011 +0000 |
| tree | edecd9bd4757a4fe7bdf4dc13e087d6a174fdc12 | |
| parent | ce0fda16084905d035e8ceb51cf42740ad781b15 [diff] | |
| parent | 4311051c358ad0e66b68934e7a33cf10ba533466 [diff] |
Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2 Conflicts: drivers/i2c/busses/i2c-designware-core.c Fixed up merge conflic