Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:21:17 +0000 (08:21 +0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Jan 2014 01:21:17 +0000 (08:21 +0700)
commita9bdddb8dd711d70c5e0068fd8ad5ae5f4419359
treef896eac7b042a60246fb0c200b465eeca1d60411
parent2e67c56248b776c0a546925c796cdb167ee4d7a0
parent2fac2b891f287691c27ee8d2eeecf39571b27fea
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

Pull i2c bugfix from Wolfram Sang.

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: Re-instate body of i2c_parent_is_i2c_adapter()