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

Browse source

Pull i2c fixes from Wolfram Sang:
 "Two buildfixes for I2C based on your tree from the day before
  yesterday.  Sadly, these build errors never reached me while the
  patches were sitting in -next.  Need to fix that"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: core: Export bus recovery functions
  i2c: jz4780: Fix build for m68k and sparc64

...

This commit is contained in:

Linus Torvalds 2015-04-18 08:19:04 -04:00

parent afad97eee4 c1c21f4e60

commit 40d7839879

2 changed files with 4 additions and 0 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

1

drivers/i2c/busses/i2c-jz4780.c

View file

3

drivers/i2c/i2c-core.c

View file