diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-18 08:19:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-18 08:19:04 -0400 |
| commit | 40d7839879b4584f91522d841afb22ed401cf40f (patch) | |
| tree | be7ceff0b9749487e05d2edaff23364911705bdd /init/init_task.c | |
| parent | afad97eee47c1f1f242202e2473929b4ef5d9f43 (diff) | |
| parent | c1c21f4e60ed4523292f1a89ff45a208bddd3849 (diff) | |
| download | blackbird-op-linux-40d7839879b4584f91522d841afb22ed401cf40f.tar.gz blackbird-op-linux-40d7839879b4584f91522d841afb22ed401cf40f.zip | |
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
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
Diffstat (limited to 'init/init_task.c')
0 files changed, 0 insertions, 0 deletions
