Linus Torvalds b11a278397 Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild ... Pull kconfig updates from Michal Marek: "Yann E Morin was supposed to take over kconfig maintainership, but this hasn't happened. So I'm sending a few kconfig patches that I collected: - Fix for missing va_end in kconfig - merge_config.sh displays used if given too few arguments - s/boolean/bool/ in Kconfig files for consistency, with the plan to only support bool in the future" * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kconfig: use va_end to match corresponding va_start merge_config.sh: Display usage if given too few arguments kconfig: use bool instead of boolean for type definition attributes		2015-02-19 10:36:45 -08:00
..
Kconfig	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2015-02-19 10:36:45 -08:00
Makefile	net: sched: Introduce connmark action	2015-01-19 16:02:06 -05:00
act_api.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
act_bpf.c	net: act_bpf: fix size mismatch on filter preparation	2015-01-26 16:08:55 -08:00
act_connmark.c	net: sched: Introduce connmark action	2015-01-19 16:02:06 -05:00
act_csum.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00
act_gact.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_ipt.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_mirred.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_nat.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_pedit.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_police.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_simple.c	sched: fix act file names in header comment	2014-11-06 15:04:41 -05:00
act_skbedit.c	net_sched: act: move tcf_hashinfo_init() into tcf_register_action()	2014-02-12 19:23:32 -05:00
act_vlan.c	sched: introduce vlan action	2014-11-21 14:20:18 -05:00
cls_api.c	cls_api.c: Fix dumping of non-existing actions' stats.	2015-02-04 20:26:12 -08:00
cls_basic.c	net: cls_basic: return from walking on match in basic_get	2015-01-26 16:08:55 -08:00
cls_bpf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
cls_cgroup.c	net: sched: cls: use nla_nest_cancel instead of nlmsg_trim	2014-12-09 21:49:58 -05:00
cls_flow.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00
cls_fw.c	net: sched: cls: use nla_nest_cancel instead of nlmsg_trim	2014-12-09 21:49:58 -05:00
cls_route.c	net: sched: cls: use nla_nest_cancel instead of nlmsg_trim	2014-12-09 21:49:58 -05:00
cls_rsvp.c	…
cls_rsvp.h	net: sched: cls: use nla_nest_cancel instead of nlmsg_trim	2014-12-09 21:49:58 -05:00
cls_rsvp6.c	…
cls_tcindex.c	net: sched: cls: use nla_nest_cancel instead of nlmsg_trim	2014-12-09 21:49:58 -05:00
cls_u32.c	net: sched: cls: remove unused op put from tcf_proto_ops	2014-12-09 14:49:02 -05:00
em_canid.c	net: sched: remove tcf_proto from ematch calls	2014-10-06 18:02:32 -04:00
em_cmp.c	…
em_ipset.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00
em_meta.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
em_nbyte.c	net: sched: remove tcf_proto from ematch calls	2014-10-06 18:02:32 -04:00
em_text.c	net: sched: remove tcf_proto from ematch calls	2014-10-06 18:02:32 -04:00
em_u32.c	…
ematch.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-10-08 16:22:22 -04:00
sch_api.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00
sch_atm.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_blackhole.c	…
sch_cbq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_choke.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_codel.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_drr.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_dsmark.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00
sch_fifo.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_fq.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
sch_fq_codel.c	net: fix suspicious rcu_dereference_check in net/sched/sch_fq_codel.c	2014-12-09 21:49:09 -05:00
sch_generic.c	net_sched: restore qdisc quota fairness limits after bulk dequeue	2014-10-09 19:12:26 -04:00
sch_gred.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_hfsc.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_hhf.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_htb.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_ingress.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_mq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_mqprio.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_multiq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_netem.c	net: add rbnode to struct sk_buff	2014-11-03 16:13:03 -05:00
sch_pie.c	sch_pie: schedule the timer after all init succeed	2014-10-29 14:28:01 -04:00
sch_plug.c	…
sch_prio.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_qfq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_red.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_sfb.c	net: sched: implement qstat helper routines	2014-09-30 01:02:26 -04:00
sch_sfq.c	net: sched: enable per cpu qstats	2014-09-30 01:02:26 -04:00
sch_tbf.c	net: sched: avoid costly atomic operation in fq_dequeue()	2014-10-06 00:55:10 -04:00
sch_teql.c	net: sched: fix skb->protocol use in case of accelerated vlan path	2015-01-13 17:51:08 -05:00