linux-next: manual merge of the usb tree with the input tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/input/tablet/wacom_wac.c between commit eb71d1bb270e ("Input:
wacom - use dev_xxx() instead of naked printk()s and dbg()s") from the
input tree and commit 3b6aee237e88 ("USB: wacom: remove dbg() usage")
from the usb tree.

I just used the input tree's version (which used "input->dev.parent"
instead of "&input->dev").
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature