diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 22:20:02 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 22:20:02 (GMT) |
| commit | 37d8cb5478651b27779b9a80d024c614c452eae3 (patch) | |
| tree | 53fe55f595dea61ba8acd72bd19d2655513b7195 /net/l2tp/l2tp_ip.c | |
| parent | dc522adbee91dd17fa31f8e8cf72673fe0e8370e (diff) | |
| parent | 07da0372dd6ca5517400ce95040861def25930c8 (diff) | |
| download | linux-fsl-qoriq-37d8cb5478651b27779b9a80d024c614c452eae3.tar.xz | |
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-parport: Various cleanups
i2c-i801: Don't depend on other kernel driver config options
i2c-i801: Check for vendor Fujitsu before probing for apanel
i2c-i801: Don't probe for slaves on IDF channels
i2c-i801: SMBus patch for Intel Panther Point DeviceIDs
i2c/writing-clients: Fix foo_driver.id_table
Diffstat (limited to 'net/l2tp/l2tp_ip.c')
0 files changed, 0 insertions, 0 deletions