aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-203-6/+6
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-01-1917-42/+51
|\
| * sctp: user perfect name for Delayed SACK Timer optionShan Wei2011-01-191-2/+2
| * net: fix can_checksum_protocol() arguments swapEric Dumazet2011-01-191-1/+1
| * Revert "netlink: test for all flags of the NLM_F_DUMP composite"David S. Miller2011-01-195-6/+6
| * net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.Jesse Gross2011-01-181-2/+2
| * ipv6: Silence privacy extensions initializationRomain Francoise2011-01-181-3/+0
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-01-182-10/+13
| |\
| | * mac80211: use maximum number of AMPDU frames as default in BA RXLuciano Coelho2011-01-131-9/+2
| | * mac80211: fix lockdep warningJohannes Berg2011-01-131-1/+11
| * | caif: checking the wrong variableDan Carpenter2011-01-151-4/+5
| * | can: test size of struct sockaddr in sendmsgKurt Van Dijck2011-01-152-0/+6
| * | Merge branch 'for-david' of git://git.open-mesh.org/ecsv/linux-mergeDavid S. Miller2011-01-154-14/+16
| |\ \
| | * | batman-adv: Use "__attribute__" shortcut macrosSven Eckelmann2011-01-163-12/+12
| | * | batman-adv: Even Batman should not dereference NULL pointersJesper Juhl2011-01-131-2/+4
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-01-148-38/+37
|\ \ \ \ | |/ / /
| * | | net: remove dev_txq_stats_fold()Eric Dumazet2011-01-132-34/+21
| * | | Merge branch 'master' of git://1984.lsi.us.es/net-2.6David S. Miller2011-01-131-1/+2
| |\ \ \
| | * | | netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack()Pablo Neira Ayuso2011-01-131-1/+2
| * | | | eth: fix new kernel-doc warningRandy Dunlap2011-01-121-1/+1
| * | | | Merge branch 'master' of git://1984.lsi.us.es/net-2.6David S. Miller2011-01-122-1/+9
| |\ \ \ \ | | |/ / /
| | * | | netfilter: fix compilation when conntrack is disabled but tproxy is enabledKOVACS Krisztian2011-01-122-1/+9
| * | | | inet6: prevent network storms caused by linux IPv6 routersAlexey Kuznetsov2011-01-121-0/+3
| * | | | net: ax25: fix information leak to userland harderKees Cook2011-01-121-1/+1
* | | | | Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-01-1410-94/+141
|\ \ \ \ \
| * | | | | rpc: allow xprt_class->setup to return a preexisting xprtJ. Bruce Fields2011-01-112-9/+12
| * | | | | rpc: keep backchannel xprt as long as server connectionJ. Bruce Fields2011-01-113-11/+29
| * | | | | rpc: move sk_bc_xprt to svc_xprtJ. Bruce Fields2011-01-112-5/+7
| * | | | | Merge commit 'v2.6.37' into for-2.6.38-incomingJ. Bruce Fields2011-01-1125-82/+154
| |\ \ \ \ \
| * | | | | | svcrpc: ensure cache_check caller sees updated entryJ. Bruce Fields2011-01-041-1/+10
| * | | | | | svcrpc: take lock on turning entry NEGATIVE in cache_checkJ. Bruce Fields2011-01-041-7/+18
| * | | | | | svcrpc: simpler request droppingJ. Bruce Fields2011-01-042-1/+3
| * | | | | | svcrpc: avoid double reply caused by deferral raceJ. Bruce Fields2011-01-041-7/+11
| * | | | | | SUNRPC: Remove more code when NFSD_DEPRECATED is not configuredJ. Bruce Fields2011-01-041-0/+12
| * | | | | | svcrpc: modifying valid sunrpc cache entries is racyJ. Bruce Fields2011-01-041-2/+1
| * | | | | | net/sunrpc/auth_gss/gss_krb5_crypto.c: Use normal negative error value returnJoe Perches2010-12-171-1/+1
| * | | | | | net: sunrpc: kill unused macrosShan Wei2010-12-173-5/+0
| * | | | | | sunrpc: svc_sock_names should hold ref to socket being closed.NeilBrown2010-12-171-4/+6
| * | | | | | sunrpc: remove xpt_poolNeilBrown2010-12-171-5/+0
| * | | | | | Merge commit 'v2.6.37-rc6' into for-2.6.38J. Bruce Fields2010-12-1749-204/+383
| |\ \ \ \ \ \
| * | | | | | | svcrpc: fix wspace-checking raceJ. Bruce Fields2010-11-191-22/+11
| * | | | | | | svcrpc: svc_close_xprt commentJ. Bruce Fields2010-11-191-1/+6
| * | | | | | | svcrpc: simplify svc_close_allJ. Bruce Fields2010-11-191-8/+8
| * | | | | | | nfsd4: centralize more calls to svc_xprt_receivedJ. Bruce Fields2010-11-191-12/+14
| * | | | | | | svcrpc: don't set then immediately clear XPT_DEFERREDJ. Bruce Fields2010-11-191-3/+2
* | | | | | | | rxrpc: rxrpc_workqueue isn't used during memory reclaimTejun Heo2011-01-141-1/+1
* | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2011-01-131-15/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | pass default dentry_operations to mount_pseudo()Al Viro2011-01-121-15/+15
* | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2011-01-131-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | net: Add missing lockdep class names for af_algMiloslav Trmač2010-12-081-3/+3