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)
commitb22d8370061898f3029cdc2601fbdec493443f03
treedae4b3859c5cf3ad0e2430ad7c11a1e8766f9b49
parent00b33277fa544676250d898fccea0a0255608e7f
parent6a250778c79d6d14db9ed8e1f86f7b934e2bf3dc
Merge branches 'upstream' and 'upstream-fixes' into for-linus
drivers/hid/hidraw.c