tree 757943342e24dbb793ac99e74b1b7e2d7be10dc6
parent c3d9d74336c10c133ed062a1d778d457c6a46422
parent 48216fbdad6cc462b056ce1e876edcc664d32a8d
parent f51661105c3c8a0afcd69f995a4f4a10e53da153
parent 2c6118e43040034d80894daeba41960bf0035b31
parent 921990b7046ab4fb523cbccc5bce2c921762232d
parent 0277873c05158c5efc97c23d52e6aec6250bde0f
parent d2b570a5d451487f0c5026ea6113842b2eed4894
author Jiri Kosina <jkosina@suse.cz> 1287866858 +0200
committer Jiri Kosina <jkosina@suse.cz> 1287866858 +0200

Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into for-linus