]> err.no Git - linux-2.6/commitdiff
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Aug 2008 19:28:50 +0000 (12:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Aug 2008 19:28:50 +0000 (12:28 -0700)
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Prevent log spam on some DVB adapters
  i2c: Add missing kerneldoc descriptions
  i2c: Fix device_init_wakeup place


Trivial merge