]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3f300ff f8dcb5e)
Merge branch 'bnx2x'
authorDavid S. Miller <davem@davemloft.net>
Wed, 29 Apr 2015 18:48:36 +0000 (14:48 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Apr 2015 18:48:36 +0000 (14:48 -0400)
commitad93e1d7b9f63bb842925711240e9fba3a104fea
tree6889aff43bf79b37ab3f1def9653e140368967e3tree | snapshot
parent3f300ff41d89fe9674b8dbab950ba2572639ee8dcommit | diff
parentf8dcb5e3365a23b620f5744f23f1918b9c38d883commit | diff
Merge branch 'bnx2x'

Michal Schmidt says:

====================
bnx2x: minor cleanups related to TPA bits

I noticed some simplification possibilities while looking into the bug
fixed by "bnx2x: really disable TPA if 'disable_tpa' is set'.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
Michael's Linux tree.