[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120327121610.e39e648811d5b00ae328077b@canb.auug.org.au>
Date: Tue, 27 Mar 2012 12:16:10 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Jason Gerecke <killertofu@...il.com>,
Chris Bagwell <chris@...bagwell.com>
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@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists