Messages in this thread | | | Date | Thu, 22 Jul 2010 11:46:55 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the input tree with the s5p tree |
| |
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in arch/arm/plat-samsung/include/plat/keypad.h between commit 1e3241300503df18a098dd35098f6975dcf622e2 ("ARM: SAMSUNG: Add keypad device support") from the s5p tree and commit 0fffed27f92d9d7a34de9fe017b7082b5958bb93 ("Input: samsung-keypad - Add samsung keypad driver") from the input tree.
This just looks like two versions of the same driver (or two drivers sharing the same header) - please sort this out. I have fixed up the header for today (by including both versions where necessary).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |