From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 01:41:20 +0000 (+1100)
Subject: Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
X-Git-Tag: next-20111213~67
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1984afc8d59bc506bf1689af6898777f275f7580;p=karo-tx-linux.git

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

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

1984afc8d59bc506bf1689af6898777f275f7580