Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Fix docbook problem ASoC/TLV320AIC3X: Stop I2C driver ID abuse i2c-omap: Fix unhandled fault i2c-bfin-twi: Disable BF54x support for now
Showing
- drivers/i2c/busses/Kconfig 1 addition, 1 deletiondrivers/i2c/busses/Kconfig
- drivers/i2c/busses/i2c-omap.c 28 additions, 8 deletionsdrivers/i2c/busses/i2c-omap.c
- drivers/i2c/i2c-core.c 2 additions, 2 deletionsdrivers/i2c/i2c-core.c
- sound/soc/codecs/tlv320aic3x.c 0 additions, 2 deletionssound/soc/codecs/tlv320aic3x.c
Loading
Please register or sign in to comment