This patch set basically syncs our tree up with the patches that were merged into Linux 3.18.
Benjamin Tissoires (7): HID: wacom: make the WL connection friendly for the desktop HID: wacom: fix timeout on probe for some wacoms HID: wacom: rename failN with some meaningful information HID: wacom: split out input allocation and registration HID: wacom: move allocation of inputs earlier HID: wacom: implement generic HID handling for pen generic devices HID: wacom: implement the finger part of the HID generic handling Geert Uytterhoeven (1): Input: wacom - fix compiler warning if !CONFIG_PM Jason Gerecke (4): HID: wacom: Add support for the Cintiq Companion Backport: Add support for the Cintiq Companion Backport: make the WL connection friendly for the desktop Backport: Fix compilation of generic HID handling patch under 3.17 Ping Cheng (1): Input: wacom - cleanup multitouch code when touch_max is 2 2.6.38/wacom_sys.c | 4 + 2.6.38/wacom_wac.c | 9 ++ 3.17/wacom.h | 7 ++ 3.17/wacom_sys.c | 210 +++++++++++++++++++++++++-------- 3.17/wacom_wac.c | 340 +++++++++++++++++++++++++++++++++++++++++++++++++---- 3.17/wacom_wac.h | 17 +++ 3.7/wacom_sys.c | 4 + 3.7/wacom_wac.c | 10 +- 8 files changed, 527 insertions(+), 74 deletions(-) -- 2.1.3 ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel