黄涛 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-axff.c
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-cypress.c
hid-debug.c
hid-dr.c
hid-elecom.c
hid-emsff.c
hid-ezkey.c
hid-gaff.c
hid-gyration.c
hid-ids.h
hid-input.c
hid-kensington.c
hid-keytouch.c
hid-kye.c
hid-lcpower.c
hid-lg.c
hid-lg.h
hid-lg2ff.c
hid-lg3ff.c
hid-lg4ff.c
hid-lgff.c
hid-magicmouse.c
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-ortek.c
hid-petalynx.c
hid-picolcd.c
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
hid-roccat-koneplus.c
hid-roccat-koneplus.h
hid-roccat-kovaplus.c
hid-roccat-kovaplus.h
hid-roccat-pyra.c
hid-roccat-pyra.h
hid-roccat.c
hid-samsung.c
hid-sjoy.c
hid-sony.c
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
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