diff options
| author | Greg Kroah-Hartman | 2012-06-25 18:31:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-06-25 18:31:00 +0200 |
| commit | bcc66c0b8881f88459f9ac21038455bcafacdc6e (patch) | |
| tree | b402e677253c3fc1038ca4a52fc54fc223261133 /drivers/iio/Kconfig | |
| parent | staging: r8712u: Remove useless driver version info (diff) | |
| parent | Linux 3.5-rc4 (diff) | |
| download | kernel-qcow2-linux-bcc66c0b8881f88459f9ac21038455bcafacdc6e.tar.gz kernel-qcow2-linux-bcc66c0b8881f88459f9ac21038455bcafacdc6e.tar.xz kernel-qcow2-linux-bcc66c0b8881f88459f9ac21038455bcafacdc6e.zip | |
Merge 3.5-rc4 into staging-next
This picks up the staging changes made in 3.5-rc4 so that everyone can sync up
properly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/Kconfig')
| -rw-r--r-- | drivers/iio/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig index 612073f6c540..d4984c8be973 100644 --- a/drivers/iio/Kconfig +++ b/drivers/iio/Kconfig @@ -8,8 +8,7 @@ menuconfig IIO help The industrial I/O subsystem provides a unified framework for drivers for many different types of embedded sensors using a - number of different physical interfaces (i2c, spi, etc). See - Documentation/iio for more information. + number of different physical interfaces (i2c, spi, etc). if IIO |