Re: [GIT] HID

[Linus Torvalds]

On Thu, Dec 2, 2010 at 5:24 PM, Jiri Kosina <jkosina@xxxxxxx> wrote:
>
> Note: you are going to get conflict in drivers/hid/hid-input.c. This is
> caused by commit a0bf0ea8 ("Input: hid-input - switch to using new keycode
> interface") which went through Dmitry's tree, as it was part of larger
> rework. It's fine to just use the variant from that commit.

Just taking Dmitry's version would have missed the removal of
KERN_DEBUG that your branch did, so I did a proper merge resolution.

Or at least it looked proper to me, and compiles. Pushed out the result,

                    Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/