summaryrefslogtreecommitdiffstats
path: root/drivers/net/3c505.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-07 07:43:03 +0100
committerDavid S. Miller <davem@davemloft.net>2008-11-07 07:43:03 +0100
commit9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch)
tree3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/net/3c505.c
parentpkt_sched: Fix qdisc len in qdisc_peek_dequeued() (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-9eeda9abd1faf489f3df9a1f557975f4c8650363.tar.xz
linux-9eeda9abd1faf489f3df9a1f557975f4c8650363.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/ath5k/base.c net/8021q/vlan_core.c
Diffstat (limited to 'drivers/net/3c505.c')
0 files changed, 0 insertions, 0 deletions