aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cassini.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-25 18:19:59 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-25 18:19:59 -0400
commit2304c3ac3634d2de59f71f7b2c58aab05959124b (patch)
tree88e13187b64f8bfdea841c4a4476ac626e4eec28 /drivers/net/cassini.c
parentfcd05809e1b2f64ece7a0b0bbe94ed29505cd2e0 (diff)
parent96fd4cd3e40e240f0c385af87f58e74da8b7099a (diff)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [netdrvr] forcedeth: add MCP77 device IDs rndis_host: reduce MTU instead of refusing to talk to devices with low max packet size cpmac: update to new fixed phy driver interface cpmac: convert to napi_struct interface cpmac: use print_mac() instead of MAC_FMT natsemi: fix oops, link back netdevice from private-struct ehea: fix port_napi_disable/enable bonding/bond_main.c: fix cut'n'paste error make bonding/bond_main.c:bond_deinit() static drivers/net/ipg.c: cleanups remove Documentation/networking/net-modules.txt
Diffstat (limited to 'drivers/net/cassini.c')
0 files changed, 0 insertions, 0 deletions