Backport Intuos Pro to 2.6.16

Signed-off-by: Jason Gerecke <killertofu@gmail.com>