diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-15 16:54:45 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-15 16:54:45 -0700 |
commit | 245f0db0de926601353776085e6f6a4c974c5615 (patch) | |
tree | b493e9e726f4a898041f7861d0df328aa1a348a1 /Documentation/spi/.gitignore | |
parent | Input: synaptics-rmi4 - using logical instead of bitwise AND (diff) | |
parent | Linux 4.5 (diff) | |
download | linux-dev-245f0db0de926601353776085e6f6a4c974c5615.tar.xz linux-dev-245f0db0de926601353776085e6f6a4c974c5615.zip |
Merge tag 'v4.5' into next
Merge with Linux 4.5 to get PROPERTY_ENTRY_INTEGER() that is needed to
fix pxa/raumfeld rotary encoder properties.
Diffstat (limited to 'Documentation/spi/.gitignore')
-rw-r--r-- | Documentation/spi/.gitignore | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/spi/.gitignore b/Documentation/spi/.gitignore deleted file mode 100644 index 4280576397e8..000000000000 --- a/Documentation/spi/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -spidev_fdx -spidev_test |