summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 14:12:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-28 14:12:15 -0700
commitd2a2fc18d98d8ee2dec1542efc7f47beec256144 (patch)
treedba9097631b9736845920bc4029cc865071b8c65 /arch/arm/mach-imx
parent7bf97e1d5a94b6a71815771bb9452fc2c022c966 (diff)
parent41101a33026c215a09e5d3549aedfcdae9105515 (diff)
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull i2c updates from Jean Delvare. Fix up trivial conflict in drivers/i2c/busses/i2c-gpio.c due to include file cleanup clashing with DT support addition (which did the same cleanup) * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-algo-bit: Don't resched on clock stretching i2c: Update the FSF address i2c: Convert drivers/i2c/muxes/* to use module_i2c_driver() i2c-i801: Use usleep_range to wait for command completion i2c-i801: Add device IDs for Intel Lynx Point i2c-isch: Decrease delay in command completion check loop i2c-gpio: Use linux/gpio.h rather than asm/gpio.h
Diffstat (limited to 'arch/arm/mach-imx')
0 files changed, 0 insertions, 0 deletions