From: Linus Torvalds Date: Mon, 18 Oct 2010 20:05:10 +0000 (-0700) Subject: Merge branch 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux X-Git-Tag: v2.6.36~10 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=f68c834b045afc8c80ec167cccf48934c8970022 Merge branch 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux: i2c-imx: do not allow interruptions when waiting for I2C to complete i2c-davinci: Fix TX setup for more SoCs --- f68c834b045afc8c80ec167cccf48934c8970022