]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
projects / mirror_ubuntu-artful-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5fcad16 b70b825)
Merge branch 'for-4.0/upstream-fixes' into for-4.1/wacom
authorJiri Kosina <jkosina@suse.cz>
Thu, 2 Apr 2015 12:09:09 +0000 (14:09 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 2 Apr 2015 12:09:09 +0000 (14:09 +0200)
commit1fd29be5cede285e673d3ed73d9ed9db59536b33
tree47d64b98c24c08ac49975a5a37ab821b7c4ad4e5tree
parent5fcad167315f224eaf6750b0fb85ee6c92f087cdcommit | diff
parentb70b82580248b5393241c986082842ec05a2b7d7commit | diff
Merge branch 'for-4.0/upstream-fixes' into for-4.1/wacom

Conflicts:
drivers/hid/wacom_wac.c

Need to fetch the 4.0 fixes to apply 4.1 patches based on top
of those.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/wacom_wac.c diff1 | diff2 | blob | history
Ubuntu Artful kernel mirror