aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-10-23 22:47:38 +0200
committerJiri Kosina <jkosina@suse.cz>2010-10-23 22:47:38 +0200
commitbbd128b5acae85b2ef346e95cc5a729ac5252f19 (patch)
tree757943342e24dbb793ac99e74b1b7e2d7be10dc6
parentc3d9d74336c10c133ed062a1d778d457c6a46422 (diff)
parent48216fbdad6cc462b056ce1e876edcc664d32a8d (diff)
parentf51661105c3c8a0afcd69f995a4f4a10e53da153 (diff)
parent2c6118e43040034d80894daeba41960bf0035b31 (diff)
parent921990b7046ab4fb523cbccc5bce2c921762232d (diff)
parent0277873c05158c5efc97c23d52e6aec6250bde0f (diff)
parentd2b570a5d451487f0c5026ea6113842b2eed4894 (diff)
downloadlinux-2.6.38-lt-ux500-bbd128b5acae85b2ef346e95cc5a729ac5252f19.tar.gz
Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into for-linus