]> err.no Git - linux-2.6/commitdiff
Merge branches 'upstream' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 23 Jul 2008 13:26:10 +0000 (15:26 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 23 Jul 2008 13:26:10 +0000 (15:26 +0200)
1  2 
drivers/hid/hidraw.c

Simple merge