diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 01:52:53 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 01:52:53 +0100 |
| commit | be4af5dfa6d976ba579bae16ff8714b755d44dad (patch) | |
| tree | edecd9bd4757a4fe7bdf4dc13e087d6a174fdc12 /drivers/scsi/ppa.h | |
| parent | Merge branches 'for-32/i2c/omap-v4', 'for-32/i2c/imx-dt', 'for-32/i2c/eg20t-v... (diff) | |
| parent | i2c: irq: Remove IRQF_DISABLED (diff) | |
| download | linux-be4af5dfa6d976ba579bae16ff8714b755d44dad.tar.xz linux-be4af5dfa6d976ba579bae16ff8714b755d44dad.zip | |
Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2
Conflicts:
drivers/i2c/busses/i2c-designware-core.c
Fixed up merge conflic
Diffstat (limited to 'drivers/scsi/ppa.h')
0 files changed, 0 insertions, 0 deletions