diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-21 16:41:15 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-21 16:41:15 -0700 |
| commit | 9c4089e87a80376071cbedc3f66a16ac028782c5 (patch) | |
| tree | 9d689bc4b86292680e7f9c9060237a1e3b43fcaf /include | |
| parent | 95a0c7c2d6cfde3fb5fdb713428ed0df4d6bdd58 (diff) | |
| parent | 0335a9554b4d6acc2d17efe752bff54ce59b57eb (diff) | |
| download | linux-9c4089e87a80376071cbedc3f66a16ac028782c5.tar.gz linux-9c4089e87a80376071cbedc3f66a16ac028782c5.tar.bz2 linux-9c4089e87a80376071cbedc3f66a16ac028782c5.zip | |
Merge tag 'ib-mfd-input-rtc-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next
Merge "Immutable branch between MFD, Input and RTC due for the v3.14
merge window" to have dm355evm_msp.h header moved into right place.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/dm355evm_msp.h (renamed from include/linux/i2c/dm355evm_msp.h) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/include/linux/i2c/dm355evm_msp.h b/include/linux/mfd/dm355evm_msp.h index 372470350fab..372470350fab 100644 --- a/include/linux/i2c/dm355evm_msp.h +++ b/include/linux/mfd/dm355evm_msp.h |