git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>
1  2 
drivers/hid/wacom_wac.c patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/wacom_wac.c
Simple merge
Pandora Kernel Repository