tree a1e7a40924e2739e29f2a419885d99c378fda0c5
parent 9ab6e6e7db3027728067a827b2366b2aca4f519d
parent 098aebc30292c10b31f6aa58bf4fe2c4b26001f6
author Linus Torvalds <torvalds@linux-foundation.org> 1405017099 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1405017099 -0700

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