tree 5c6d729ed7bb6cc06a1f5f7bd3cfa81e1eff1337
parent c000131c711f68cb68712e6553ddce5fa6ad5c5c
parent 8e29da9ee8958cc17e27f4053420f1c982614793
author Linus Torvalds <torvalds@linux-foundation.org> 1215050429 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215050429 -0700

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Fix bad hint about irqs in i2c.h
  i2c: Documentation: fix device matching description