Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

Browse source

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-parport: Fix adapter list handling
  i2c-i801: Move device ID definitions to driver

...

This commit is contained in:

Linus Torvalds 2011-05-02 08:46:50 -07:00

parent 646032e3b0 56acc7a39a

commit bc9be57f85

3 changed files with 19 additions and 17 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

5

drivers/i2c/busses/i2c-i801.c

View file

27

drivers/i2c/busses/i2c-parport.c

View file

4

include/linux/pci_ids.h

View file