On Sat, 29 Sep 2012, Henrik Rydberg wrote:

quoted

quoted

Hmm, it looks like the work on making evdev using dynamic device numbers
will clash with Henrik's changes. I think I will also pull this into my
tree and then git should be able to resolve it all properly in -next.

That should work. Alternatively you can pull 'from-henrik' branch from my 
tree in case Henrik has already ditched/rebased his tree.

The tree will remain the same until after 3.7-rc1 is out, so pulling
should be fine.

Linus has just pulled from hid.git, so you can cross-check the pending 
changes now.

Thanks,

-- 
Jiri Kosina
SUSE Labs