projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f720d0c d0ba913)
Merge branch 'sh_eth-fixes'
authorDavid S. Miller <davem@davemloft.net>
Thu, 10 Mar 2016 21:06:49 +0000 (16:06 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Mar 2016 21:06:49 +0000 (16:06 -0500)
commit2a5a259f9757250dc786e2091759155a868179ae
treefcd16efd2a857d1a8ceb31f9fe92a8f9bc1ecb22tree | snapshot
parentf720d0caa0af2c33ad15310974c7320345ab4468commit | diff
parentd0ba913488dc8c55d1880f5ed34f096dc45fb05dcommit | diff
Merge branch 'sh_eth-fixes'

Sergei Shtylyov says:

====================
sh_eth: fix couple of bugs in sh_eth_ring_format()

   Here's a set of 2 patches against DaveM's 'net.git' repo fixing two bugs
in sh_eth_.ring_format()...

[1/2] sh_eth: fix NULL pointer dereference in sh_eth_ring_format()
[2/2] sh_eth: advance 'rxdesc' later in sh_eth_ring_format()
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
John Crispins staging tree