diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-07 07:34:59 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-07 07:34:59 +0100 |
| commit | 554738da71004d96e06fb75f4772dfc3b0f47810 (patch) | |
| tree | 149a96ce3727025d3b9260961ec94ba8306db278 /net/nonet.c | |
| parent | Input: wacom - add support for digitizer in Lenovo W700 (diff) | |
| parent | Input: wacom_w8001 - support pen or touch only devices (diff) | |
| download | linux-554738da71004d96e06fb75f4772dfc3b0f47810.tar.xz linux-554738da71004d96e06fb75f4772dfc3b0f47810.zip | |
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
Diffstat (limited to 'net/nonet.c')
0 files changed, 0 insertions, 0 deletions