projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d80bc0f) | patch
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)
commitb7c7d01aaed1f71d9afe815a569f0a81465a1744
tree69d2d061d327713f3c1acc574507edbbb4a5ccb6tree | snapshot
parentd80bc0fd262ef840ed4e82593ad6416fa1ba3fc4commit | 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>
net/core/ethtool.c diff | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git