diff options
| author | Eugene Teo <eugeneteo@kernel.org> | 2011-01-24 21:05:17 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 21:05:17 -0800 |
| commit | b7c7d01aaed1f71d9afe815a569f0a81465a1744 (patch) | |
| tree | 69d2d061d327713f3c1acc574507edbbb4a5ccb6 /Documentation/dontdiff | |
| parent | d80bc0fd262ef840ed4e82593ad6416fa1ba3fc4 (diff) | |
net: clear heap allocation for ethtool_get_regs()
There is a conflict between commit b00916b1 and a77f5db3. This patch resolves
the conflict by clearing the heap allocation in ethtool_get_regs().
Cc: stable@kernel.org
Signed-off-by: Eugene Teo <eugeneteo@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/dontdiff')
0 files changed, 0 insertions, 0 deletions