Merge the UHID driver, backported from Linux 3.8.
The userspace HID driver is needed by the JB Bluetooth stack in order to process input from Bluetooth keyboards.