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

Browse source

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

...

This commit is contained in:

Linus Torvalds 2014-10-03 14:20:44 -07:00

parent 039001972a 86b59bbfae

commit 126d4576cb

2 changed files with 9 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

12

drivers/i2c/busses/i2c-qup.c

View file

2

drivers/i2c/busses/i2c-rk3x.c

View file