summaryrefslogtreecommitdiff
path: root/tools/perf/ui/gtk/setup.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 /tools/perf/ui/gtk/setup.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 'tools/perf/ui/gtk/setup.c')
0 files changed, 0 insertions, 0 deletions
92908aaa822097d27c6af8ec8'>diff)
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "A set of fixes for this series. This contains: - Set of fixes for the nvme target code - A revert of patch from this merge window, causing a regression with WRITE_SAME on iSCSI targets at least. - A fix for a use-after-free in the new O_DIRECT bdev code. - Two fixes for the xen-blkfront driver" * 'for-linus' of git://git.kernel.dk/linux-block: Revert "sd: remove __data_len hack for WRITE SAME" nvme-fc: use blk_rq_nr_phys_segments nvmet-rdma: Fix missing dma sync to nvme data structures nvmet: Call fatal_error from keep-alive timout expiration nvmet: cancel fatal error and flush async work before free controller nvmet: delete controllers deletion upon subsystem release nvmet_fc: correct logic in disconnect queue LS handling block: fix use after free in __blkdev_direct_IO xen-blkfront: correct maximum segment accounting xen-blkfront: feature flags handling adjustments
Diffstat (limited to 'sound/pci/emu10k1/emumpu401.c')