黄涛 19b3e31e91 Merge remote-tracking branch 'aosp/android-3.0' into develop-3.0-jb ... Conflicts: drivers/mmc/core/core.c drivers/net/wireless/bcm4319/dhd_sdio.c drivers/net/wireless/bcm4319/include/linux_osl.h drivers/net/wireless/bcm4319/wl_iw.c drivers/net/wireless/bcmdhd/dhd.h drivers/net/wireless/bcmdhd/dhd_cfg80211.c drivers/net/wireless/bcmdhd/dhd_linux.c drivers/net/wireless/bcmdhd/include/wlioctl.h drivers/net/wireless/bcmdhd/wl_cfg80211.c drivers/net/wireless/bcmdhd/wldev_common.c drivers/net/wireless/bcmdhd/wldev_common.h		2012-08-21 15:53:18 +08:00
..
usbhid	Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb	2012-07-12 18:08:01 +08:00
hid-a4tech.c
hid-apple.c	hid/apple: modern macbook airs use the standard apple function key translations	2011-11-11 09:37:22 -08:00
hid-axff.c	HID: ACRUX - activate the device immediately after binding	2011-03-12 21:47:18 +01:00
hid-belkin.c
hid-cherry.c
hid-chicony.c	HID: add more hotkeys in Asus AIO keyboards	2012-04-02 09:27:12 -07:00
hid-core.c	HID: add extra hotkeys in Asus AIO keyboards	2012-04-02 09:27:12 -07:00
hid-cypress.c	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
hid-debug.c	hid-debug: Show application usage for each collection.	2011-08-15 18:33:20 -07:00
hid-dr.c
hid-elecom.c
hid-emsff.c
hid-ezkey.c
hid-gaff.c
hid-gyration.c	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
hid-ids.h	HID: add extra hotkeys in Asus AIO keyboards	2012-04-02 09:27:12 -07:00
hid-input.c	HID: Add null check for hidinput.	2011-09-21 17:19:38 -07:00
hid-kensington.c
hid-keytouch.c	HID: add support for Keytouch IEC 60945	2011-02-17 15:12:45 +01:00
hid-kye.c
hid-lcpower.c
hid-lg.c	HID: add support for Logitech G27 wheel	2011-05-03 10:15:03 +02:00
hid-lg.h
hid-lg2ff.c
hid-lg3ff.c
hid-lg4ff.c
hid-lgff.c	Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus	2011-05-23 12:49:25 +02:00
hid-magicmouse.c	revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36	2011-10-28 16:02:47 +08:00
hid-microsoft.c
hid-monterey.c
hid-multitouch.c	Merge linux-stable 3.0.28 into android-3.0	2012-04-19 15:20:03 -07:00
hid-ntrig.c	HID: hid-ntrig: init settle and mode check	2011-03-14 13:10:13 +01:00
hid-ortek.c	HID: add support for Skycable 0x3f07 wireless presenter	2011-03-21 16:12:23 +01:00
hid-petalynx.c
hid-picolcd.c	Merge branch 'master' into upstream.	2011-05-18 17:06:49 +02:00
hid-pl.c
hid-prodikeys.c
hid-quanta.c
hid-roccat-arvo.c
hid-roccat-arvo.h
hid-roccat-common.c
hid-roccat-common.h
hid-roccat-kone.c
hid-roccat-kone.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
hid-roccat-koneplus.c	HID: roccat: fix actual/startup profile sysfs attribute in koneplus	2011-05-18 16:34:06 +02:00
hid-roccat-koneplus.h	HID: roccat: fix actual/startup profile sysfs attribute in koneplus	2011-05-18 16:34:06 +02:00
hid-roccat-kovaplus.c
hid-roccat-kovaplus.h
hid-roccat-pyra.c	HID: roccat: Add support for wireless variant of Pyra	2011-03-24 12:47:46 +01:00
hid-roccat-pyra.h
hid-roccat.c
hid-samsung.c
hid-sjoy.c
hid-sony.c	HID: add support for Sony Navigation Controller	2011-04-28 15:43:13 +02:00
hid-sunplus.c
hid-tmff.c
hid-topseed.c
hid-twinhan.c
hid-uclogic.c
hid-wacom.c
hid-waltop.c
hid-zpff.c
hid-zydacron.c
hidraw.c	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
Kconfig	HID: uhid: introduce user-space I/O driver support for HID	2012-08-16 12:44:27 -07:00
Makefile	HID: uhid: introduce user-space I/O driver support for HID	2012-08-16 12:44:27 -07:00
uhid.c	HID: uhid: Fix sending events with invalid data	2012-08-16 12:44:30 -07:00