summaryrefslogtreecommitdiffstats
path: root/fs/proc/loadavg.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-05-09 19:13:44 +0200
committerDavid S. Miller <davem@davemloft.net>2014-05-09 19:13:44 +0200
commit97e72829d7c0efc9fe7768148ef490bc83ebce0e (patch)
treee44775afd0fd1f06c7c6ff8bd14250227eac4e17 /fs/proc/loadavg.c
parentMerge branch 'qlcnic-next' (diff)
parentbe2net: use MCCQ instead of MBOX in be_cmd_rss_config() (diff)
downloadlinux-97e72829d7c0efc9fe7768148ef490bc83ebce0e.tar.xz
linux-97e72829d7c0efc9fe7768148ef490bc83ebce0e.zip
Merge branch 'be2net-next'
Sathya Perla says: ==================== be2net: patch set This patch set contains the following modificatons: * three patches (1/7 to 3/7) that fix indentation style issues * convert the u8 vlan[] array to a bit-map to reduce memory usage * use MCCQ instead of MBOX in be_cmd_rss_config() as the MCCQ is already created by that time * include rx-comp-error counter in ethtool stats * remove the unused promiscuous setting from be_cmd_vlan_config() Pls apply to net-next tree. Thanks! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/proc/loadavg.c')
0 files changed, 0 insertions, 0 deletions