Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux

Browse source

* 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux:
  i2c-stu300: off by one issue
  i2c-pnx: Add stop conditions for end of transfer
  i2c-pnx: Limit maximum divider to 1023
  i2c-omap: fix OOPS in omap_i2c_unidle() during probe
  i2c-imx: fix error handling

...

This commit is contained in:

Linus Torvalds 2010-04-22 07:20:30 -07:00

parent 74a920139a 42df64b1f8

commit b7b6cf005b

4 changed files with 18 additions and 8 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

6

drivers/i2c/busses/i2c-imx.c

View file

10

drivers/i2c/busses/i2c-omap.c

View file

8

drivers/i2c/busses/i2c-pnx.c

View file

2

drivers/i2c/busses/i2c-stu300.c

View file