aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge branch 'for-2.6.26' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2008-05-20
|\
| * Merge branch 'from-tomtucker' into for-2.6.26J. Bruce Fields2008-05-20
| |\
| | * svcrdma: Verify read-list fits within RPCSVC_MAXPAGESTom Tucker2008-05-19
| | * svcrdma: Change svc_rdma_send_error return type to voidTom Tucker2008-05-19
| | * svcrdma: Copy transport address and arm CQ before calling rdma_acceptTom Tucker2008-05-19
| | * svcrdma: Set rqstp transport address in rdma_read_complete functionTom Tucker2008-05-19
| | * svcrdma: Use ib verbs version of dma_unmapTom Tucker2008-05-19
| | * svcrdma: Cleanup queued, but unprocessed I/O in svc_rdma_freeTom Tucker2008-05-19
| | * svcrdma: Move the QP and cm_id destruction to svc_rdma_freeTom Tucker2008-05-19
| | * svcrdma: Add reference for each SQ/RQ WRTom Tucker2008-05-19
| | * svcrdma: Move destroy to kernel threadTom Tucker2008-05-19
| | * svcrdma: Shrink scope of spinlock on RQ CQTom Tucker2008-05-19
| | * svcrdma: Use standard Linux lists for context cacheTom Tucker2008-05-19
| | * svcrdma: Simplify RDMA_READ deferral buffer managementTom Tucker2008-05-19
| | * svcrdma: Remove unused READ_DONE context flags bitTom Tucker2008-05-19
| | * svcrdma: Return error from rdma_read_xdr so caller knows to free contextTom Tucker2008-05-19
| | * svcrdma: Fix error handling during listening endpoint creationTom Tucker2008-05-19
| | * svcrdma: Free context on post_recv error in send_replyTom Tucker2008-05-19
| | * svcrdma: Free context on ib_post_recv errorTom Tucker2008-05-19
| | * svcrdma: Add put of connection ESTABLISHED reference in rdma_cma_handlerTom Tucker2008-05-19
| | * svcrdma: Fix return value in svc_rdma_sendTom Tucker2008-05-19
| | * svcrdma: Fix race with dto_tasklet in svc_rdma_sendTom Tucker2008-05-19
| | * svcrdma: Simplify receive buffer postingTom Tucker2008-05-19
| | * svc: Remove unused header files from svc_xprt.cTom Tucker2008-05-19
| | * svc: Remove extra check for XPT_DEAD bit in svc_xprt_enqueueTom Tucker2008-05-19
| * | svcrpc: fix proc/net/rpc/auth.unix.ip/content displayJ. Bruce Fields2008-05-18
| * | nfsd: reorder printk in do_probe_callback to avoid use-after-freeJ. Bruce Fields2008-05-18
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-05-20
|\ \
| * | pktgen: make sure that pktgen_thread_worker has been executedDenis V. Lunev2008-05-20
| * | [VLAN]: Propagate selected feature bits to VLAN devicesPatrick McHardy2008-05-20
| * | drivers/atm/: remove CVS keywordsAdrian Bunk2008-05-20
| * | vlan: Correctly handle device notifications for layered VLAN devicesPatrick McHardy2008-05-20
| * | net: Fix call to ->change_rx_flags(dev, IFF_MULTICAST) in dev_change_flags()David Woodhouse2008-05-20
| * | net_sched: cls_api: fix return value for non-existant classifiersPatrick McHardy2008-05-20
| * | ipsec: Use the correct ip_local_out functionHerbert Xu2008-05-20
| * | ipv6 addrconf: Allow infinite prefix lifetime.YOSHIFUJI Hideaki2008-05-19
| * | ipv6 route: Fix lifetime in netlink.YOSHIFUJI Hideaki2008-05-19
| * | ipv6 addrconf: Fix route lifetime setting in corner case.YOSHIFUJI Hideaki2008-05-19
| * | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville...David S. Miller2008-05-19
| |\ \
| | * | wireless: Create 'device' symlink in sysfsMasakazu Mokuno2008-05-16
| | * | wireless, airo: waitbusy() won't delayRoel Kluin2008-05-16
| | * | libertas: fix command timeout after firmware failureBrian Cavagnolo2008-05-16
| | * | mac80211: Add RTNL version of ieee80211_iterate_active_interfacesIvo van Doorn2008-05-16
| | * | mac80211 : Association with 11n hidden ssid ap.Abhijeet Kolekar2008-05-16
| | * | hostap: fix "registers" registration in procfsMathieu Chouquet-Stringer2008-05-15
| * | | ndisc: Add missing strategies for per-device retrans timer/reachable time set...YOSHIFUJI Hideaki2008-05-19
| * | | ipv6: Move <linux/in6.h> from header-y to unifdef-y.Robert P. J. Day2008-05-19
| * | | l2tp: avoid skb truesize bug if headroom is increasedJames Chapman2008-05-19
| |/ /
| * | isdn/capi: Return proper errnos on module init.Marcin Slusarz2008-05-15
| * | iphase: Fix 64bit warning.Alan Cox2008-05-15