diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-20 14:49:56 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-20 14:49:56 -0800 |
commit | 9097a058d49e049925d8da72db07fffcee24efa0 (patch) | |
tree | 7fdc7d1ad2be05e7807c57cb680cd73f4a3c1f7f /arch/alpha/include/uapi | |
parent | Merge tag 'upstream-4.20-rc7' of git://git.infradead.org/linux-ubifs (diff) | |
parent | i2c: nvidia-gpu: mark resume function as __maybe_unused (diff) | |
download | linux-dev-9097a058d49e049925d8da72db07fffcee24efa0.tar.xz linux-dev-9097a058d49e049925d8da72db07fffcee24efa0.zip |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"I2C has a MAINTAINERS update for you, so people will be immediately
pointed to the right person for this previously orphaned driver.
And one of Arnd's build warning fixes for a new driver added this
cycle"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: nvidia-gpu: mark resume function as __maybe_unused
MAINTAINERS: add entry for i2c-axxia driver
Diffstat (limited to 'arch/alpha/include/uapi')
0 files changed, 0 insertions, 0 deletions