summaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-15 17:51:13 +0200
committerDavid S. Miller <davem@davemloft.net>2011-07-15 17:51:13 +0200
commit25009a1ae1171eda6bff44b7e44eb0e076713811 (patch)
tree182491960c3f837d12880a2f94369c8ebd8d1fcd /drivers/net/r8169.c
parent8139cp: convert to new VLAN model. (diff)
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff)
downloadlinux-25009a1ae1171eda6bff44b7e44eb0e076713811.tar.xz
linux-25009a1ae1171eda6bff44b7e44eb0e076713811.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/r8169.c')
0 files changed, 0 insertions, 0 deletions