linux-next: manual merge of the hid tree with Linus' tree

From: Stephen Rothwell
Date: Sun Mar 16 2014 - 22:32:57 EST

Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/i2c-hid/i2c-hid.c between commit 9d27f43274e4 ("HID: fix
buffer allocations") from Linus' tree and commit 649f94790314 ("HID:
i2c-hid: use generic .request() implementation") from the hid tree.

I fixed it up (the latter removes the code modified by the former, so I
just used the latter) and can carry the fix as necessary (no action is

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgpFytcAyeDuP.pgp
Description: PGP signature