aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/ethtool.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 14:17:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 14:17:43 -0400
commitd515e86e639890b33a09390d062b0831664f04a2 (patch)
tree37aea609704ce28ad44840279b95725e07c19a43 /net/core/ethtool.c
parent79c4581262e225a7c96d88b632b05ab3b5e9a52c (diff)
parent2f07a88b30f510c7625d75cdf286903b465350a0 (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: BKL ioctl pushdown
Diffstat (limited to 'net/core/ethtool.c')
0 files changed, 0 insertions, 0 deletions