From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 03:20:00 +0000 (+1100)
Subject: Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
X-Git-Tag: next-20111103~49
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=112c06426baf1b7cc87ac288516a1ddfec8b3dc9;p=karo-tx-linux.git

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

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

112c06426baf1b7cc87ac288516a1ddfec8b3dc9