Merge branch 'master' into for-next

[sfrench/cifs-2.6.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index e7d6a13ec6a623ab1d4123d80a4aae37bb76aaa9..eae0c7e468cf33fdce47b081b747d33de6a2057e 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -320,7 +320,7 @@ config HID_LOGITECH_DJ
        Say Y if you want support for Logitech Unifying receivers and devices.
        Unifying receivers are capable of pairing up to 6 Logitech compliant
        devices to the same receiver. Without this driver it will be handled by
-       generic USB_HID driver and all incomming events will be multiplexed
+       generic USB_HID driver and all incoming events will be multiplexed
        into a single mouse and a single keyboard device.
 
 config LOGITECH_FF