tree c076d2f0b5d4ae8726a50206042d3e3a41620fe4
parent 56a8bd6dcf81693e61a712097216904f3a4ab536
parent 69479f8da68f1930b2078b2ebf6533fb00339918
author Dmitry Torokhov <dmitry.torokhov@gmail.com> 1292519868 -0800
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> 1292519868 -0800

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next

Conflicts:
	drivers/input/Makefile