tree 1e87f8ba2527d1eae2896b377da8c61b0e1d3b82
parent 039001972a959ab31008a3924ff9519063371bc2
parent 86b59bbfae2a895aa26b3d15f31b1a705dbfede1
author Linus Torvalds <torvalds@linux-foundation.org> 1412371244 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1412371244 -0700

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

Pull i2c fixes from Wolfram Sang:
 "Two i2c driver bugfixes"

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: qup: Fix order of runtime pm initialization
  i2c: rk3x: fix 0 length write transfers