From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Nov 2012 19:25:39 +0000 (-0800)
Subject: Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar... 
X-Git-Tag: firefly_0821_release~3680^2~1641
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e8017454ffb4e99f94b1a7e6dcb9ed519ee93441;p=firefly-linux-kernel-4.4.55.git

Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging

Pill i2c fixes from Jean Delvare.

Well, "fixes"..  The biggest patch here is actually Jan marking Wolfram
Sang as the main i2c subsystem maintainer, with Jan staying on as the PC
controller maintainer.

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c-mux-pinctrl: Fix probe error path
  MAINTAINERS: i2c: 7 years, this is it
---

e8017454ffb4e99f94b1a7e6dcb9ed519ee93441