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
..
3com	drivers/net: Use setup_timer and mod_timer	2015-02-11 19:40:12 -08:00
8390
adaptec
adi
aeroflex
agere	et131x: use msecs_to_jiffies for conversions	2015-02-11 19:37:43 -08:00
allwinner
alteon	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
altera
amd	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-02-10 20:01:30 -08:00
apm	drivers: net: xgene: Make xgene_enet_of_match depend on CONFIG_OF	2015-02-11 19:39:08 -08:00
apple
arc
atheros	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-15 00:53:17 -05:00
broadcom	tg3: Hold tp->lock before calling tg3_halt() from tg3_init_one()	2015-02-11 19:51:08 -08:00
brocade	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
cadence	net/macb: fix sparse warning	2015-02-05 16:03:28 -08:00
calxeda
chelsio	Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2015-02-17 15:18:19 -08:00
cirrus	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
cisco	enic: enic_main: fix sparse warnings	2015-02-05 16:03:27 -08:00
davicom	dm9000: Add regulator and reset support to dm9000	2015-01-15 14:08:07 -05:00
dec	net/tulip: don't warn about unknown ARM architecture	2015-02-02 18:53:34 -08:00
dlink
emulex	MODULE_DEVICE_TABLE: fix some callsites	2015-02-13 21:21:40 -08:00
faraday
freescale	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
fujitsu
hisilicon	net: hip04: add missing MODULE_LICENSE	2015-02-02 18:51:03 -08:00
hp
i825xx
ibm	IBM-EMAC: Delete an unnecessary check before the function call "of_dev_put"	2015-02-04 20:29:47 -08:00
icplus
intel	i40e: Fix for stats init function call in Rx setup	2015-02-09 18:45:00 -08:00
marvell	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
mellanox	net/mlx5_core: Fix configuration of log_uar_page_sz	2015-02-11 19:42:23 -08:00
micrel
microchip
moxa
myricom	myri10ge: Delete an unnecessary check before the function call "kfree"	2015-02-05 00:25:10 -08:00
natsemi	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
neterion	vxge: fix sparse warning	2015-02-05 16:07:06 -08:00
nuvoton
nvidia	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
nxp
octeon
oki-semi
packetengines
pasemi
qlogic	qlcnic: Delete existing multicast MAC list before adding new	2015-02-11 19:43:22 -08:00
qualcomm
rdc
realtek	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-02-10 20:01:30 -08:00
renesas	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
rocker	net: rocker: Add support for retrieving port level statistics	2015-02-01 23:17:39 -08:00
samsung	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-09 14:35:57 -08:00
seeq
sfc
sgi
silan
sis
smsc	net: smc91x: Add Atari EtherNAT support	2015-01-15 19:32:58 -05:00
stmicro	stmmac: DMA threshold mode or SF mode can be different among multiple device instance	2015-02-01 23:14:24 -08:00
sun	sunvnet: don't change gso data on clones	2015-02-11 19:41:40 -08:00
tehuti	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
ti	Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2015-02-19 10:36:45 -08:00
tile	tile: use %*pb[l] to print bitmaps including cpumasks and nodemasks	2015-02-13 21:21:37 -08:00
toshiba
tundra
via	mii: Handle link state changes for forced modes in mii_check_media()	2015-01-19 15:43:42 -05:00
wiznet
xilinx
xircom
xscale
dnet.c	net: dnet: fix dnet_poll()	2015-01-11 21:44:55 -05:00
dnet.h
ec_bhf.c
ethoc.c
fealnx.c
jme.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
jme.h
Kconfig
korina.c
lantiq_etop.c
Makefile
netx-eth.c