Messages in this thread | | | Date | Tue, 27 Mar 2012 12:16:10 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the input tree with Linus' tree |
| |
Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in drivers/input/tablet/wacom_sys.c between commit 24e3e5ae1e4c ("Input: wacom - fix physical size calculation for 3rd-gen Bamboo") from Linus' tree and commit 16bf288c4be6 ("Input: wacom - create inputs when wireless connect") from the input tree.
The latter seems to incorporate the former, so I used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |