v4 of this series has been rebased against jikos/hid.git/for-linus There was another bit of mismerge code duplication in for-linus that caused merge conflicts with patches 3 and above in v3 of the series. The first patch in v4 fixes the mismerge and the remaining patches now apply cleanly. Patch 1 should be queued for 3.15 as soon as possible. -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html