Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

path: root/iosched.h

#ifndef IOSCHED_H
#define IOSCHED_H

extern void ioprio_print(void);
extern void set_ioprio_rt(void);
extern void set_ioprio_be(void);

#endif /* IOSCHED_H */