Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2008-03-25 09:06:44 -07:00

parent e584152571 8c07e46f39

commit 5004de1809

4 changed files with 31 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/i2c/busses/Kconfig

View file

36

drivers/i2c/busses/i2c-omap.c

View file

4

drivers/i2c/i2c-core.c

View file

2

sound/soc/codecs/tlv320aic3x.c

View file