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)
commit9c2bdac40eba639c438690b1245a020e7c2530df
treeee3f8dd83bf64dd8bc48aebd492ef239a8b98adb
parent41108eb10142e0552f2de1e4c0675b108c5f018f
parent4329cf8613b0c7cdc020005f0e1ea7378681f1d8
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: Prevent log spam on some DVB adapters
  i2c: Add missing kerneldoc descriptions
  i2c: Fix device_init_wakeup place