summaryrefslogtreecommitdiff
path: root/drivers/infiniband/hw/hfi1/user_sdma.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-15 11:45:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-15 11:45:13 -0800
commit57d64e6f5fac7b47dd03487f5f2670a7f0c67335 (patch)
tree20cb793a777c9039b72ac8cad2599cb5b25c0716 /drivers/infiniband/hw/hfi1/user_sdma.c
parent19c75bcbe0113cbbf05e4d89e0502a23358bfca9 (diff)
parentd09f00810850dd6e6eac8895b62bc3fc35435431 (diff)
Merge tag 'pwm/for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Pull pwm updates from Thierry Reding: "This is a very tiny pull request, with just a new driver for HiSilicon BVT SoCs and a cleanup for the Amlogic Meson driver. There are other patches on the list, but my timing was really bad this time and I ended up not having the time to look at them in enough detail to be comfortable merging them" * tag 'pwm/for-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm: pwm: Add PWM driver for HiSilicon BVT SOCs pwm: meson: Remove unneeded platform MODULE_ALIAS
Diffstat (limited to 'drivers/infiniband/hw/hfi1/user_sdma.c')
0 files changed, 0 insertions, 0 deletions