]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 25 Oct 2011 07:58:12 +0000 (09:58 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 25 Oct 2011 07:58:12 +0000 (09:58 +0200)
commite9ecc538547c7e156f251a6018cc355dab532e1c
treec3ac710e02d65fc08629b25fcfba0e79e0092910
parent2b50236a45fc3e6e0ee89589c4e8b251425c6eeb
parentfe9f072b4f1c98ecf7f26ba964d1719405ac7c3d
Merge branch 'upstream-fixes' into for-linus

Conflicts:
drivers/hid/hid-wacom.c
drivers/hid/hid-wacom.c