From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Jan 2014 01:21:17 +0000 (+0700)
Subject: Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
X-Git-Tag: v3.13~14
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a9bdddb8dd711d70c5e0068fd8ad5ae5f4419359;p=linux.git

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/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()
---

a9bdddb8dd711d70c5e0068fd8ad5ae5f4419359