]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:18:05 +0000 (13:18 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 Mar 2012 12:18:05 +0000 (13:18 +0100)
commit74872c7f292515465e0de371201b6caa9c917ad4
tree42b6a7c9edf2f40c7b645a493d63bdb67e5f7100
parent653584fee0952fe4d4a9bc3cb007bf5f823b0e84
parent2fefa0e9d23bbe5d77cc06d2351ac31fecdffbee
Merge branch 'upstream' into for-linus

Conflicts:
drivers/hid/Makefile
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c
drivers/hid/hid-wacom.c
drivers/hid/usbhid/hid-quirks.c