projects / linux-drm-fsl-dcu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ee72ca b55ebc2 e00ddc9 0db3bfc 3200a6a b22e00f)
Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into for...
authorJiri Kosina <jkosina@suse.cz>
Tue, 25 Oct 2011 07:54:16 +0000 (09:54 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 25 Oct 2011 07:54:16 +0000 (09:54 +0200)
1  2  3  4  5  6 
MAINTAINERS patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/hid/Kconfig patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/hid/hid-core.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/hid/hid-ids.h patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/hid/Kconfig
index 1130a898712516d2bfc9149bf9c859e401b6ac57,342be43211d85c1b5b357a3c34cafe31bd3ce734,d2c97343fc0d586ccc3c08dfee23439c24ac5cbb,3cbe8cc51ef3e98dd34488d1e10640489b5537eb,1130a898712516d2bfc9149bf9c859e401b6ac57,9907dc9cfb12260ee7dfeee7a1402ed84dda0c55..2b006bfa09358704e07d8923c55aff7f002e6a5f
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
--- 3/drivers/hid/Kconfig
--- 4/drivers/hid/Kconfig
--- 5/drivers/hid/Kconfig
--- 6/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@@@@ -589,7 -589,6 -606,6 -590,6 -589,7 -589,8 +607,8 @@@@@@@ config HID_WACOM_POWER_SUPPL
      config HID_WIIMOTE
        tristate "Nintendo Wii Remote support"
        depends on BT_HIDP
 +++    depends on LEDS_CLASS
+++++   select POWER_SUPPLY
        ---help---
        Support for the Nintendo Wii Remote bluetooth device.
      
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
Freescale DCU DRM driver