summaryrefslogtreecommitdiff
path: root/drivers/dma-buf/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-11-20 09:28:40 (GMT)
committerJiri Kosina <jkosina@suse.cz>2015-11-20 09:28:40 (GMT)
commit2f23985879c2fb2967e8bca77b1014b437a9b9ff (patch)
tree429f6914125df178d941c5f6c5a23beddeb6ed70 /drivers/dma-buf/Makefile
parent319645cac26c2d065a485f5d59228433ad602f71 (diff)
parent27b9d5a254dcbc6095404c1bab7c335419601eb8 (diff)
downloadlinux-2f23985879c2fb2967e8bca77b1014b437a9b9ff.tar.xz
Merge branch 'for-dmitry/logitech-g920-merge-base' into for-4.5/logitech
Pull the branch that has been established to be jointly merged to both hid.git and input.git, because both trees have different depending patches on top. Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/dma-buf/Makefile')
0 files changed, 0 insertions, 0 deletions