]> 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)
commitd00f9535eece70c18906bf6671c67b386c0f6293
treec3ac710e02d65fc08629b25fcfba0e79e0092910
parent85a796790781eb2ce4a54d211ca8b8163f4fbf9f
parentb9e975c306708a5faddab8869de87e0e0fb0d957
Merge branch 'upstream-fixes' into for-linus

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