aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-03-183-4/+4
|\
| * kbuild, mtd, net: a few comment typo fixes and rewordingGilles Espinasse2011-02-171-2/+2
| * Merge branch 'master' into for-nextJiri Kosina2011-02-1585-416/+725
| |\
| * | Kill off warning: ‘inline’ is not at beginning of declarationJesper Juhl2011-01-192-2/+2
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-03-182-16/+196
|\ \ \
| | \ \
| | \ \
| *-. \ \ Merge branches 'dragonrise', 'hidraw-feature', 'multitouch', 'ntrig', 'roccat...Jiri Kosina2011-03-172-16/+196
| |\ \ \ \ | | |_|/ / | |/| | |
| | | * | HID: bt hidp: send Output reports using SET_REPORT on the Control channelAntonio Ospite2011-02-221-1/+1
| | |/ / | |/| |
| | * | HID: bt: Add support for hidraw HIDIOCGFEATURE and HIDIOCSFEATUREAlan Ott2011-02-112-4/+117
| | * | HID: bt: Wait for ACK on Sent ReportsAlan Ott2011-02-112-3/+55
| | * | HID: bt: Move hid_add_device() call to after hidp_session() has started.Alan Ott2011-02-112-8/+23
| |/ /
* | | Merge branch 'nfs-for-2.6.39' of git://git.linux-nfs.org/projects/trondmy/nfs...Linus Torvalds2011-03-178-96/+120
|\ \ \
| * | | RPC: killing RPC tasks races fixedStanislav Kinsbursky2011-03-171-1/+3
| * | | xprt: remove redundant checkj223yang@asset.uwaterloo.ca2011-03-171-1/+1
| * | | SUNRPC: Convert struct rpc_xprt to use atomic_t countersTrond Myklebust2011-03-171-8/+8
| * | | SUNRPC: Ensure we always run the tk_callback before tk_actionTrond Myklebust2011-03-171-8/+6
| * | | sunrpc: fix printk format warningRandy Dunlap2011-03-151-1/+2
| * | | xprt: remove redundant null checkj223yang@asset.uwaterloo.ca2011-03-151-4/+3
| * | | gss:krb5 only include enctype numbers in gm_upcall_enctypesKevin Coffman2011-03-112-2/+2
| * | | RPCRDMA: Fix FRMR registration/invalidate handling.Tom Tucker2011-03-112-8/+45
| * | | RPCRDMA: Fix to XDR page base interpretation in marshalling logic.Tom Tucker2011-03-111-44/+42
| * | | NFSv4.1: filelayout async error handlerAndy Adamson2011-03-111-0/+8
| * | | RPC: clarify rpc_run_task error handlingFred Isaman2011-03-112-12/+0
| * | | RPC: remove check for impossible condition in rpc_make_runnableFred Isaman2011-03-111-8/+1
* | | | Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2011-03-166-100/+59
|\ \ \ \
| * | | | ipx: remove the BKLArnd Bergmann2011-03-052-33/+20
| * | | | appletalk: remove the BKLArnd Bergmann2011-03-051-24/+16
| * | | | x25: remove the BKLArnd Bergmann2011-03-053-43/+23
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-16414-12848/+29639
|\ \ \ \ \
| * | | | | xfrm: Refcount destination entry on xfrm_lookupSteffen Klassert2011-03-161-0/+2
| * | | | | net: introduce rx_handler results and logic around thatJiri Pirko2011-03-164-19/+30
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-03-161-9/+27
| |\ \ \ \ \
| | * | | | | netfilter ebtables: fix xt_AUDIT to work with ebtablesThomas Graf2011-03-161-9/+27
| * | | | | | net_sched: fix ip_tos2prioDan Siemon2011-03-151-1/+1
| * | | | | | xfrm: fix __xfrm_route_forward()Eric Dumazet2011-03-151-2/+2
| * | | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-03-154-15/+38
| |\ \ \ \ \ \
| | * | | | | | tcp_cubic: fix low utilization of CUBIC with HyStartSangtae Ha2011-03-141-0/+7
| | * | | | | | tcp_cubic: make the delay threshold of HyStart less sensitiveSangtae Ha2011-03-141-1/+1
| | * | | | | | tcp_cubic: enable high resolution ack time if neededstephen hemminger2011-03-141-0/+4
| | * | | | | | tcp_cubic: fix clock dependencystephen hemminger2011-03-141-12/+19
| | * | | | | | tcp_cubic: make ack train delta value a parameterstephen hemminger2011-03-141-1/+4
| | * | | | | | tcp_cubic: fix comparison of jiffiesstephen hemminger2011-03-141-2/+4
| | * | | | | | tcp: fix RTT for quick packets in congestion controlstephen hemminger2011-03-141-1/+1
| | * | | | | | af_unix: update locking commentDaniel Baluta2011-03-141-1/+1
| | * | | | | | bridge: skip forwarding delay if not using STPstephen hemminger2011-03-141-2/+2
| * | | | | | | Phonet: fix aligned-mode pipe socket buffer header reserveRémi Denis-Courmont2011-03-151-1/+1
| * | | | | | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2011-03-157-12/+201
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-03-157-12/+201
| | |\ \ \ \ \ \ \
| | | * | | | | | | mac80211: fix channel type recalculation with HT and non-HT interfacesFelix Fietkau2011-03-141-0/+3
| | | * | | | | | | mac80211: Shortcut minstrel_ht rate setup for non-MRR capable devicesHelmut Schaa2011-03-141-7/+34
| | | * | | | | | | mac80211: implement support for cfg80211_ops->{get,set}_ringparamJohn W. Linville2011-03-113-0/+95