diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 18:27:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-23 18:27:51 -0800 |
| commit | 431047166883101a93e9c713d54bd62466dd6ab9 (patch) | |
| tree | 7ff0f2ce7ad273f01e0bc567f439e576b0ba8891 /drivers/usb/serial/ftdi_sio.h | |
| parent | f51671fc85562cdcc64ca59fe92719863c7c25f1 (diff) | |
| parent | 57eb81b14e35a14df64ac3597bc90c26ce04a9b4 (diff) | |
Merge branch 'i2c-fixes' of git://git.fluff.org/bjdooks/linux
* 'i2c-fixes' of git://git.fluff.org/bjdooks/linux:
i2c-omap: OMAP3: Fix I2C lockup during timeout/error cases
i2c-omap: Don't write IE state in unidle if 0
i2c-bfin-twi: fix CLKDIV calculation
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.h')
0 files changed, 0 insertions, 0 deletions