aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/fpga-mgr.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2015-10-10 18:03:31 +0000
committerLinus Torvalds <[email protected]>2015-10-10 18:03:31 +0000
commit91dbc047e9c1284634ae3570c0382c2288c5548b (patch)
treed0df267e626e6404dd040be94c670eed2eddfbc1 /drivers/fpga/fpga-mgr.c
parentMerge tag 'char-misc-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentstaging: speakup: fix speakup-r regression (diff)
downloadkernel-91dbc047e9c1284634ae3570c0382c2288c5548b.tar.gz
kernel-91dbc047e9c1284634ae3570c0382c2288c5548b.zip
Merge tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH: "Here are two tiny staging tree fixes for 4.3-rc5. One fixes the broken speakup subsystem as reported by a user, and the other removes an entry in the MAINTAINERS file for a developer that doesn't want to be listed anymore" * tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: speakup: fix speakup-r regression MAINTAINERS: Remove myself as nvec co-maintainer
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions