]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:33:42 +0000 (11:33 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:35:11 +0000 (11:35 +0200)
commita4e01c09b9fa5c4e39bfb1866e09c4b88fc9aacf
tree9dbe8427ee72d1aa2fce24a53df2723c3745e2be
parent81fec206a71b1571177a3e652b6834c1f6a62972
parent96e8b83df7e2205e3981e6fd37247c74e06618cb
parent8d19bc48b8e38f993c40aa25e941152817a5727c
parent0d8b25e6dab8503f4a3f62f983e5c19aba6e8b0e
Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/Kconfig
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-logitech-dj.c