Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Apr 2016 00:04:42 +0000 (17:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Apr 2016 00:04:42 +0000 (17:04 -0700)
commit6a7c924314dd1b4facfccc682011622c15e71ea3
tree66f219e5cef0132f3d147971a1d59639db8fd3ac
parent9f2394c9be47a754bae9e4b6d382bdd4d77d0a11
parentcaf280800aaf73f0796d1bb3fa0f6576c8222258
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "Some bugfixes from I2C:

   - fix a uevent triggered boot problem by removing a useless debug
     print

   - fix sysfs-attributes of the new i2c-demux-pinctrl driver to follow
     standard kernel behaviour

   - fix a potential division-by-zero error (needed two takes)"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: jz4780: really prevent potential division by zero
  Revert "i2c: jz4780: prevent potential division by zero"
  i2c: jz4780: prevent potential division by zero
  i2c: mux: demux-pinctrl: Update docs to new sysfs-attributes
  i2c: mux: demux-pinctrl: Clean up sysfs attributes
  i2c: prevent endless uevent loop with CONFIG_I2C_DEBUG_CORE