linux-next: manual merge of the input tree with Linus' tree
From: Stephen Rothwell
Date: Mon Mar 26 2012 - 21:16:26 EST
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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature