summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-24 03:27:51 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-24 03:27:51 +0100
commit431047166883101a93e9c713d54bd62466dd6ab9 (patch)
tree7ff0f2ce7ad273f01e0bc567f439e576b0ba8891 /drivers/scsi
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff)
parenti2c-omap: OMAP3: Fix I2C lockup during timeout/error cases (diff)
downloadlinux-431047166883101a93e9c713d54bd62466dd6ab9.tar.xz
linux-431047166883101a93e9c713d54bd62466dd6ab9.zip
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/scsi')
0 files changed, 0 insertions, 0 deletions