Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 02:00:29 +0000 (19:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Jul 2008 02:00:29 +0000 (19:00 -0700)
commitf7572da502916e6abac06d698c0b6a7119cea0c1
tree5c6d729ed7bb6cc06a1f5f7bd3cfa81e1eff1337
parentc000131c711f68cb68712e6553ddce5fa6ad5c5c
parent8e29da9ee8958cc17e27f4053420f1c982614793
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