summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ipmr-nl'David S. Miller2015-11-3010-68/+188
|\
| * net: ipmr: add mfc newroute/delroute netlink supportNikolay Aleksandrov2015-11-301-0/+129
| * net: ipmr: fix setsockopt error returnNikolay Aleksandrov2015-11-301-3/+5
| * net: ipmr: move pimsm_enabled to pim.h and renameNikolay Aleksandrov2015-11-302-8/+8
| * net: ipmr: move struct mr_table and VIF_EXISTS to mroute.hNikolay Aleksandrov2015-11-302-20/+19
| * net: ipmr: adjust mroute.h style and drop externNikolay Aleksandrov2015-11-301-26/+21
| * net: ipmr: remove unused MFC_NOTIFY flag and make the flags enumNikolay Aleksandrov2015-11-302-5/+7
| * net: remove unnecessary mroute.h includesNikolay Aleksandrov2015-11-307-7/+0
|/
* Merge branch 'mlxsw-hwmon'David S. Miller2015-11-307-0/+697
|\
| * mlxsw: core: Implement fan control using hwmonJiri Pirko2015-11-301-1/+120
| * mlxsw: reg: Add definition of fan management registersJiri Pirko2015-11-301-0/+133
| * mlxsw: core: Implement temperature hwmon interfaceJiri Pirko2015-11-305-0/+264
| * mlxsw: reg: Add definition of temperature management registersJiri Pirko2015-11-301-0/+111
| * mlxsw: spectrum: Add support for port identificationIdo Schimmel2015-11-301-0/+24
| * mlxsw: reg: Add Management LED Control register definitionIdo Schimmel2015-11-301-0/+46
|/
* net: Generalise wq_has_sleeper helperHerbert Xu2015-11-3013-28/+44
* Merge tag 'wireless-drivers-next-for-davem-2015-11-25' of git://git.kernel.or...David S. Miller2015-11-29660-314/+511
|\
| * mac80211_hwsim: move Kconfig entry for sorting alphabeticallyKalle Valo2015-11-181-13/+13
| * ath: unify Kconfig with other vendorsKalle Valo2015-11-183-11/+12
| * ti: unify Kconfig with other vendorsKalle Valo2015-11-185-12/+15
| * mediatek: unify Kconfig with other vendorsKalle Valo2015-11-183-9/+12
| * rt2x00: move under ralink vendor directoryKalle Valo2015-11-1851-4/+20
| * rsi: add vendor Kconfig entryKalle Valo2015-11-183-3/+17
| * realtek: create separate Kconfig fileKalle Valo2015-11-184-10/+24
| * prism54: move under intersil vendor directoryKalle Valo2015-11-1821-23/+22
| * orinoco: move under intersil vendor directoryKalle Valo2015-11-1836-4/+3
| * p54: move under intersil vendor directoryKalle Valo2015-11-1822-4/+3
| * hostap: move under intersil vendor directoryKalle Valo2015-11-1825-3/+20
| * zd1211rw: move under zydas vendor directoryKalle Valo2015-11-1820-3/+5
| * zd1201: move under zydas vendor directoryKalle Valo2015-11-187-22/+37
| * mwl8k: move under marvell vendor directoryKalle Valo2015-11-186-12/+12
| * mwifiex: move under marvell vendor directoryKalle Valo2015-11-1853-4/+3
| * libertas_tf: move under marvell vendor directoryKalle Valo2015-11-1812-21/+21
| * libertas: move under marvell vendor directoryKalle Valo2015-11-1836-3/+20
| * iwlwifi: move under intel vendor directoryKalle Valo2015-11-18127-3/+4
| * iwlegacy: move under intel directoryKalle Valo2015-11-1825-3/+4
| * ipw2x00: move under intel vendor directoryKalle Valo2015-11-1818-5/+21
| * cw1200: move under st vendor directoryKalle Valo2015-11-1832-3/+20
| * brcm80211: move under broadcom vendor directoryKalle Valo2015-11-18119-12/+12
| * b43legacy: move under broadcom vendor directoryKalle Valo2015-11-1830-3/+3
| * b43: move under broadcom vendor directoryKalle Valo2015-11-1868-3/+20
| * atmel: move under atmel vendor directoryKalle Valo2015-11-1811-50/+65
| * airo: move under cisco vendor directoryKalle Valo2015-11-187-45/+60
| * adm80211: move under admtek vendor directoryKalle Valo2015-11-177-30/+47
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2015-11-2513-140/+311
|\ \
| * | i40e: Bump version to 1.4.2Catherine Sullivan2015-11-251-2/+2
| * | i40e: create a generic configure rss functionHelin Zhang2015-11-253-52/+107
| * | i40e: rework the functions to configure RSS with similar parametersHelin Zhang2015-11-253-26/+71
| * | i40e: return the number of enabled queues for ETHTOOL_GRXRINGSHelin Zhang2015-11-251-1/+1
| * | i40evf: handle many MAC filters correctlyMitch Williams2015-11-251-8/+24
OpenPOWER on IntegriCloud