Re: linux-next: manual merge of the hid tree with Linus' tree
From: Marek Vasut
Date: Mon Sep 10 2012 - 01:51:28 EST
Dear Stephen Rothwell,
> Hi Jiri,
> Today's linux-next merge of the hid tree got a conflict in
> drivers/hid/usbhid/hid-quirks.c between commit 67ddbb3e6568 ("HID: add
> NOGET quirk for Eaton Ellipse MAX UPS") from Linus' tree and commit
> 2843b673d034 ("HID: add quirk for Freescale i.MX28 ROM recovery") from
> the hid tree.
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary (no action is required).
Looks obviously correct, thank you Stephen!
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/