On Thursday, November 10, 2011 06:11:47 PM Stephen Rothwell wrote: > Hi Dmitry, > > Today's linux-next merge of the input tree got a conflict in > drivers/input/keyboard/samsung-keypad.c between commit 532f74540134 > ("input: samsung-keypad: Add device tree support") from the s5p tree and > commit 400bf2995be6 ("Input: samsung-keypad - switch to using > SIMPLE_DEV_PM_OPS") from the input tree. > > I fixed it up (see below) and can carry the fix as necessary. Yep, looks good, thanks Stephen. -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html