diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:31:44 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:31:44 -0800 |
commit | 238ccbb050a243e935bb3fc679c2e4bbff7004aa (patch) | |
tree | 3381b895861f625b1524acfd32d4a90eb79108bd /net/netfilter/x_tables.c | |
parent | c5113e3d66d7c7140fe854c7638a27eb3a23fd7d (diff) | |
parent | 1d9f26262aef6d63ff65eba0fd5f1583f342b69b (diff) | |
download | linux-238ccbb050a243e935bb3fc679c2e4bbff7004aa.tar.gz linux-238ccbb050a243e935bb3fc679c2e4bbff7004aa.tar.bz2 linux-238ccbb050a243e935bb3fc679c2e4bbff7004aa.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (22 commits)
Input: ALPS - add interleaved protocol support (Dell E6x00 series)
Input: keyboard - don't override beep with a bell
Input: altera_ps2 - fix test of unsigned in altera_ps2_probe()
Input: add mc13783 touchscreen driver
Input: ep93xx_keypad - update driver to new core support
Input: wacom - separate pen from express keys on Graphire
Input: wacom - add defines for data packet report IDs
Input: wacom - add support for new LCD tablets
Input: wacom - add defines for packet lengths of various devices
Input: wacom - ensure the device is initialized properly upon resume
Input: at32psif - do not sleep in atomic context
Input: i8042 - add Gigabyte M1022M to the noloop list
Input: i8042 - allow installing platform filters for incoming data
Input: i8042 - fix locking in interrupt routine
Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad
Input: document use of input_event() function
Input: sa1111ps2 - annotate probe() and remove() methods
Input: ambakmi - annotate probe() and remove() methods
Input: gscps2 - fix probe() and remove() annotations
Input: altera_ps2 - add annotations to probe and remove methods
...
Diffstat (limited to 'net/netfilter/x_tables.c')
0 files changed, 0 insertions, 0 deletions