Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2014 18:31:39 +0000 (11:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2014 18:31:39 +0000 (11:31 -0700)
commit8de74717e1cd0e9ff69e31c71278cf18f6437165
treea1e7a40924e2739e29f2a419885d99c378fda0c5
parent9ab6e6e7db3027728067a827b2366b2aca4f519d
parent098aebc30292c10b31f6aa58bf4fe2c4b26001f6
Merge branch 'i2c/for-current' of git://git./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