diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 00:02:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 00:02:58 +0200 |
| commit | 22a3b9771117d566def0150ea787fcc95f16e724 (patch) | |
| tree | 20e24aa4df50cde8d28211531e893a7be61d1dfe /net/mac80211/aes_ccm.h | |
| parent | Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/p... (diff) | |
| parent | Merge branches 'roccat', 'upstream' and 'wiimote' into for-linus (diff) | |
| download | linux-22a3b9771117d566def0150ea787fcc95f16e724.tar.xz linux-22a3b9771117d566def0150ea787fcc95f16e724.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (31 commits)
HID: fix support for Microsoft comfort mouse 4500
HID: hid-multitouch: add one new multitouch device's VID/PID
HID: prodikeys: remove a redundant forward declaration of struct pcmidi_snd
HID: prodikeys: make needlessly global symbols static
HID: emsff: properly handle emsff_init failure
HID: ACRUX - add missing hid_hw_stop() in ax_probe() error path
HID: fix horizontal wheel for ms comfort mouse 4500
HID: uclogic: Add support for UC-Logic WP1062
HID: wiimote: Add sysfs support to wiimote driver
HID: wiimote: Cache wiimote led state
HID: wiimote: Add wiimote led request
HID: wiimote: Add wiimote input button parser
HID: wiimote: Add wiimote event handler
HID: wiimote: Add output queue for wiimote driver
HID: wiimote: Add wiimote send function
HID: wiimote: Synchronize wiimote input and hid event handling
HID: wiimote: Register input device in wiimote hid driver
HID: wiimote: Add wiimote device structure
HID: wiimote: Register wiimote hid driver stub
HID: wiimote: Add Nintendo Wii Remote driver stub
...
Diffstat (limited to 'net/mac80211/aes_ccm.h')
0 files changed, 0 insertions, 0 deletions