From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Jul 2014 18:31:39 +0000 (-0700)
Subject: Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
X-Git-Tag: v3.16-rc5~29
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8de74717e1cd0e9ff69e31c71278cf18f6437165;p=linux.git

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c build fix and cleanup from Wolfram Sang:
 "One buildfix for the i2c subsystem.  While here, I decided to add the
  header cleanup as well"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: sun6i-p2wi: Remove duplicate inclusion of module.h
  i2c: mux: pca954x: fix dependencies
---

8de74717e1cd0e9ff69e31c71278cf18f6437165