git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

author	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Tue, 8 Oct 2013 15:43:00 +0000 (08:43 -0700)
committer	Dmitry Torokhov <dmitry.torokhov@gmail.com>
	Tue, 8 Oct 2013 15:43:00 +0000 (08:43 -0700)
commit	e3c55d406bd8df1a878546002c93db90c42be10c
tree	efb0ba2707c95fd7166cf1b76887c43c977e37dd	tree \| snapshot (tar.gz zip)
parent	4d6e482675f13e33599fc3d18fc723959be0a9b6	commit \| diff
parent	d0e639c9e06d44e713170031fe05fb60ebe680af	commit \| diff

Merge tag 'v3.12-rc4' into next

Merge with mainline to bring in changes to input subsystem that were
committed through other trees.