summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 17:09:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-10 17:09:13 -0800
commit8adbf8d46718a8f110de55ec82c40d04d0c362cc (patch)
treedbaf7109edaaa26496e131e6644074fbcb75c75d /drivers/char
parent0be8c8bd1de21d75ef14eb6af35b664f70a35746 (diff)
parent0cc43a1806f078f7fd414850d8f1f1761696e4af (diff)
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Constify i2c_client where possible i2c-algo-bit: Complain about masters which can't read SCL i2c-algo-bit: Refactor adapter registration i2c: Add generic I2C multiplexer using GPIO API i2c-nforce2: Remove unnecessary cast of pci_get_drvdata i2c-i801: Include <linux/slab.h>
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions