tree f05d0a426959ee01ce74c1f4733076d3b0ee4c8d
parent 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68
parent c872b0fccc6e086beea0a7b3b4123b7d0e75a868
author Jiri Kosina <jkosina@suse.cz> 1274272004 +0200
committer Jiri Kosina <jkosina@suse.cz> 1274272004 +0200

Merge branch 'egalax' into for-linus

Conflicts:
	drivers/hid/hid-ids.h