From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 18 Nov 2011 00:48:48 +0000 (+1100)
Subject: Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
X-Git-Tag: next-20111118~51
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=40a20435e40c48577217d6dc30abdbc47436fe0c;p=karo-tx-linux.git

Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
	drivers/i2c/busses/i2c-designware-platdrv.c
---

40a20435e40c48577217d6dc30abdbc47436fe0c