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)
commitf6f12427844516bc8e9cf84f43aca7bbbaa48157
treec3ac710e02d65fc08629b25fcfba0e79e0092910
parentb0eae38cebc54e618896d3e6a799939da51a8cac
parentbca621421c53caf73f36e181d6e5fe41fe0da7a7
Merge branch 'upstream-fixes' into for-linus

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