summaryrefslogtreecommitdiff
path: root/iosched.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-11-25 10:04:50 +0100
committerDaniel Borkmann <dborkman@redhat.com>2013-11-25 10:05:55 +0100
commitb168f5f60a9cc4490b499a067da5273b0f40337c (patch)
tree2294e8872f330e34574c329b4dfbaef3441ef756 /iosched.c
parent6feb59668308a326ec979b7992613138b986c985 (diff)
trafgen: inherit netsniff-ng's -H -Q options
Also make these options available to trafgen. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'iosched.c')
0 files changed, 0 insertions, 0 deletions
7b9206e405&id2=53cd1ad1a68fd10f677445e04ed63aa9ce39b36b'>diff)parent2ad5d52d42810bed95100a3d912679d8864421ec (diff)
Merge branch 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull two parisc fixes from Helge Deller: "One fix to avoid usage of BITS_PER_LONG in user-space exported swab.h header which breaks compiling qemu, and one trivial fix for printk continuation in the parisc parport driver" * 'parisc-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux: parisc: Don't use BITS_PER_LONG in userspace-exported swab.h header parisc, parport_gsc: Fixes for printk continuation lines
Diffstat (limited to 'include/drm/drm_hashtab.h')