aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-10-23 06:37:16 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-10-23 06:37:16 -0400
commitdd9d064e34a1b1c96d631cca73e2a6efc5834f4a (patch)
tree8e3aed218c842178688f31659a952d95145efb4b /net/dccp/Makefile
parentMerge tag 'char-misc-4.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc (diff)
parentstaging: bcm2835-audio: Fix memory corruption (diff)
downloadlinux-dev-dd9d064e34a1b1c96d631cca73e2a6efc5834f4a.tar.xz
linux-dev-dd9d064e34a1b1c96d631cca73e2a6efc5834f4a.zip
Merge tag 'staging-4.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging and IIO fixes from Greg KH: "Here are a small number of patches to resolve some reported IIO and a staging driver problem. Nothing major here, full details are in the shortlog below. All have been in linux-next with no reported issues" * tag 'staging-4.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: bcm2835-audio: Fix memory corruption iio: adc: at91-sama5d2_adc: fix probe error on missing trigger property iio: adc: dln2-adc: fix build error iio: dummy: events: Add missing break staging: iio: ade7759: fix signed extension bug on shift of a u8 iio: pressure: zpa2326: Remove always-true check which confuses gcc iio: proximity: as3935: noise detection + threshold changes
Diffstat (limited to 'net/dccp/Makefile')
0 files changed, 0 insertions, 0 deletions