]> git.baikalelectronics.ru Git - kernel.git/commit
net: clear heap allocation for ethtool_get_regs()
authorEugene Teo <eugeneteo@kernel.org>
Tue, 25 Jan 2011 05:05:17 +0000 (21:05 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Jan 2011 05:05:17 +0000 (21:05 -0800)
commit856cbdf59057184b875f1e6f2adad3433234835e
tree69d2d061d327713f3c1acc574507edbbb4a5ccb6
parent560a2056805e31de996496a04ebe0d0c2846699e
net: clear heap allocation for ethtool_get_regs()

There is a conflict between commit 844be28b and bbd966cc. 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>
net/core/ethtool.c