summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2006-09-2410-113/+274
|\
| * net/ieee80211: fix more crypto-related build breakageJeff Garzik2006-09-222-3/+19
| * Merge branch 'master' into upstreamJeff Garzik2006-09-2221-319/+443
| |\
| * \ Merge branch 'master' into upstreamJeff Garzik2006-09-202-4/+6
| |\ \
| * \ \ Merge branch 'master' into upstreamJeff Garzik2006-09-1913-41/+50
| |\ \ \
| * | | | [PATCH] ethtool: allow const ethtool_opsStephen Hemminger2006-09-131-7/+7
| * | | | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linvil...Jeff Garzik2006-09-065-60/+132
| |\ \ \ \
| | * | | | [PATCH] ieee80211: Workaround malformed 802.11 frames from APZhu Yi2006-08-291-7/+10
| | * | | | [PATCH] ieee80211: Fix TKIP and WEP decryption error on SMP machinesZhu Yi2006-08-292-41/+84
| | * | | | [PATCH] ieee80211: TKIP and CCMP replay check reworkZhu Yi2006-08-292-3/+36
| | * | | | [PATCH] ieee80211: remove ieee80211_tx() is_queue_full warningZhu Yi2006-08-291-7/+0
| | * | | | [PATCH] ieee80211: Fix header->qos_ctl endian issueZhu Yi2006-08-292-2/+2
| | * | | | Merge branch 'from-linus' into upstreamJohn W. Linville2006-08-2920-299/+273
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'from-linus' into upstreamJohn W. Linville2006-08-2213-75/+91
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'from-linus' into upstreamJohn W. Linville2006-08-1431-119/+249
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'upstream-fixes' into upstreamJohn W. Linville2006-08-041-1/+23
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'from-linus' into upstreamJohn W. Linville2006-08-0427-122/+430
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'master' into upstreamJeff Garzik2006-09-049-30/+46
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into upstreamJeff Garzik2006-08-2920-299/+273
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-08-1933-127/+250
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-08-081-1/+23
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into upstreamJeff Garzik2006-08-0711-67/+90
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-08-0327-122/+430
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | / / / / / / | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | [PATCH] ieee80211: Make ieee80211_rx_any usableDaniel Drake2006-07-271-10/+28
| * | | | | | | | | | | | [PATCH] softmac: export highest_supported_rate functionDaniel Drake2006-07-271-11/+5
| * | | | | | | | | | | | [PATCH] softmac: ERP handling and driver-level notificationsDaniel Drake2006-07-274-25/+96
| * | | | | | | | | | | | [PATCH] ieee80211: small ERP handling additionsDaniel Drake2006-07-271-0/+1
* | | | | | | | | | | | | Merge git://git.linux-nfs.org/pub/linux/nfs-2.6Linus Torvalds2006-09-239-351/+460
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | NFSv4: rpc_mkpipe creating socket inodes w/out sk buffersSteve Dickson2006-09-221-1/+1
| * | | | | | | | | | | | | SUNRPC: Fix Oops in pmap_getport_doneTrond Myklebust2006-09-221-24/+22
| * | | | | | | | | | | | | SUNRPC: Add refcounting to the struct rpc_xprtTrond Myklebust2006-09-222-8/+28
| * | | | | | | | | | | | | SUNRPC: Clean up soft task error handlingTrond Myklebust2006-09-222-27/+15
| * | | | | | | | | | | | | SUNRPC: Handle ENETUNREACH, EHOSTUNREACH and EHOSTDOWN socket errorsTrond Myklebust2006-09-221-0/+8
| * | | | | | | | | | | | | SUNRPC: rpc_delay() should not clobber the rpc_task->tk_statusTrond Myklebust2006-09-221-10/+6
| * | | | | | | | | | | | | SUNRPC: Make rpc_mkpipe() take the parent dentry as an argumentTrond Myklebust2006-09-222-20/+25
| * | | | | | | | | | | | | SUNRPC: export new RPC client functions with _GPLChuck Lever2006-09-221-5/+5
| * | | | | | | | | | | | | SUNRPC: Eliminate xprt_create_proto and rpc_create_clientChuck Lever2006-09-224-125/+1
| * | | | | | | | | | | | | SUNRPC: Convert RPC portmapper to use new rpc_create() APIChuck Lever2006-09-221-18/+15
| * | | | | | | | | | | | | SUNRPC: use sockaddr + size when creating remote transport endpointsChuck Lever2006-09-222-0/+136
| * | | | | | | | | | | | | SUNRPC: Use "sockaddr_storage" for storing RPC client's remote peer addressChuck Lever2006-09-223-7/+13
| * | | | | | | | | | | | | SUNRPC: Teach rpc_pipe.c to use new rpc_peeraddr() APIChuck Lever2006-09-221-4/+2
| * | | | | | | | | | | | | SUNRPC: Create API for displaying remote peer addressChuck Lever2006-09-221-0/+13
| * | | | | | | | | | | | | SUNRPC: add xprt switch API for printing formatted remote peer addressesChuck Lever2006-09-221-8/+71
| * | | | | | | | | | | | | SUNRPC: remove extraneous header inclusionsChuck Lever2006-09-223-4/+0
| * | | | | | | | | | | | | SUNRPC: Teach the RPC portmapper to use the new rpc_peeraddr() API.Chuck Lever2006-09-221-2/+3
| * | | | | | | | | | | | | SUNRPC: create API for getting remote peer addressChuck Lever2006-09-221-0/+21
| * | | | | | | | | | | | | SUNRPC: Introduce transport switch callout for pluggable rpcbindChuck Lever2006-09-223-4/+5
| * | | | | | | | | | | | | SUNRPC: Support for RPC child tasks no longer neededChuck Lever2006-09-221-82/+0
| * | | | | | | | | | | | | SUNRPC: Clean-up after recent changes to sunrpc/pmap_clnt.cChuck Lever2006-09-221-28/+42
| * | | | | | | | | | | | | SUNRPC: Make RPC portmapper use per-transport storageChuck Lever2006-09-223-61/+106