Hi Jiri,

Today's linux-next merge of the hid tree got a conflict in
drivers/hid/hid-tmff.c between commits
454db62d208add27f30fcbcc00435768245407c9 ("USB: remove warn() macro from
usb hid drivers") and 3e85ea87fdfbb9440dacda77b4de30472e0d38c9 ("USB:
remove info() macro from usb HID drivers") from the usb tree and commit
a9c923a59c4f106ee7385a5b210215db3eeb1d8d ("HID: convert to dev_* prints")
from the hid tree.

I fixed it up (just used the hid tree versions) and can carry the fix.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/