git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d80bc0f)
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)
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>

No differences found
Pandora Kernel Repository