Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Nov 2012 19:25:39 +0000 (11:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Nov 2012 19:25:39 +0000 (11:25 -0800)
commite8017454ffb4e99f94b1a7e6dcb9ed519ee93441
tree8f6247fc5aecd552ed25bdfdb9d7bc1d416fd3c7
parent7c96cfcd4e9e57ee58ead8d93f4dbb5c7421386f
parentaa1e3e81e75ceb3d977c3292cefafcd5179eb8b8
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