summaryrefslogtreecommitdiff
path: root/net/caif/cffrml.c
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2017-02-06 16:07:13 +0000
committerDavid S. Miller <davem@davemloft.net>2017-02-07 11:42:34 -0500
commit89d82452d1fd283bb1e313bc7a1f7c324362cf02 (patch)
treee7a02aae2f94d3db17ee606d2067e22075cfecd7 /net/caif/cffrml.c
parentfee402211ff2d2f0a136a9d77b30d66aeea193b8 (diff)
net/sched: act_mirred: remove duplicated include from act_mirred.c
Remove duplicated include. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif/cffrml.c')
0 files changed, 0 insertions, 0 deletions
te-remove&id=23fbe2cdc1de80120cf9ccd478ac57c3a3a0764b&id2=eeeefd41843218c55a8782a6920f044d9bf6207a'>diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe: "A single fix that should go into 4.10, fixing a regression on some devices with the WRITE_SAME command" * 'for-linus' of git://git.kernel.dk/linux-block: block: don't try Write Same from __blkdev_issue_zeroout
Diffstat (limited to 'net/bluetooth/Kconfig')