summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2009-01-095-151/+9
|\
| * dmaengine: kill struct dma_client and supporting infrastructureDan Williams2009-01-061-96/+3
| * dmaengine: replace dma_async_client_register with dmaengine_getDan Williams2009-01-061-2/+1
| * net_dma: convert to dma_find_channelDan Williams2009-01-065-45/+5
| * dmaengine: provide a common 'issue_pending_all' implementationDan Williams2009-01-061-8/+1
| * dmaengine: up-level reference counting to the module levelDan Williams2009-01-061-1/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-01-0820-133/+432
|\ \
| * | wimax: testing for rfkill support should also test for CONFIG_RFKILL_MODULEInaky Perez-Gonzalez2009-01-081-1/+1
| * | wimax: fix kconfig interactions with rfkill and input layersInaky Perez-Gonzalez2009-01-081-0/+14
| * | wimax: fix '#ifndef CONFIG_BUG' layout to avoid warningInaky Perez-Gonzalez2009-01-081-3/+5
| * | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2009-01-0832-206/+2690
| |\ \
| * | | vlan: add neigh_setupFrank Blaschka2009-01-081-0/+14
| * | | tcp6: Add GRO supportHerbert Xu2009-01-082-4/+43
| * | | ipv6: Add GRO supportHerbert Xu2009-01-081-5/+102
| * | | phonet: update to net_device_opsStephen Hemminger2009-01-071-4/+8
| * | | bluetooth: driver API updateStephen Hemminger2009-01-073-27/+19
| * | | appletalk: convert aarp to net_device_opsStephen Hemminger2009-01-071-2/+3
| * | | dsa: convert to net_device_ops (v2)Stephen Hemminger2009-01-061-10/+41
| * | | can: omit unneeded skb_clone() callsOliver Hartkopp2009-01-063-21/+21
| * | | vlan: Add GRO interfacesHerbert Xu2009-01-061-23/+88
| * | | gro: Add internal interfaces for VLANHerbert Xu2009-01-061-23/+59
| * | | sch_teql: convert to net_device_opsStephen Hemminger2009-01-061-8/+12
| * | | wireless: convert wireless ioctl to net_device_opsStephen Hemminger2009-01-061-2/+2
* | | | fix similar typos to successfullColy Li2009-01-081-1/+1
* | | | remove lots of double-semicolonsFernando Carrijo2009-01-083-3/+3
| |/ / |/| |
* | | Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2009-01-077-58/+96
|\ \ \
| * | | SUNRPC: The sunrpc server code should not be used by out-of-tree modulesTrond Myklebust2009-01-077-39/+39
| * | | svc: Clean up deferred requests on transport destructionTom Tucker2009-01-071-7/+18
| * | | svc: Move kfree of deferral record to common codeTom Tucker2009-01-072-5/+3
| * | | SUNRPC: Ensure the server closes sockets in a timely fashionTrond Myklebust2009-01-061-1/+20
| * | | sunrpc: add sv_maxconn field to svc_serv (try #3)Jeff Layton2009-01-061-6/+16
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6Linus Torvalds2009-01-0713-0/+2115
|\ \ \
| * | | wimax: Makefile, Kconfig and docbook linkage for the stackInaky Perez-Gonzalez2009-01-074-0/+54
| * | | wimax: debugfs controlsInaky Perez-Gonzalez2009-01-071-0/+90
| * | | wimax: basic API: kernel/user messaging, rfkill and resetInaky Perez-Gonzalez2009-01-073-0/+1096
| * | | genetlink: export genl_unregister_mc_group()Inaky Perez-Gonzalez2009-01-071-0/+1
| * | | wimax: generic device management (registration, deregistration, lookup)Inaky Perez-Gonzalez2009-01-072-0/+741
| * | | wimax: debug macros and debug settings for the WiMAX stackInaky Perez-Gonzalez2009-01-071-0/+42
| * | | wimax: internal API for the kernel space WiMAX stackInaky Perez-Gonzalez2009-01-071-0/+91
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-01-074-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | trivial: fix then -> than typos in comments and documentationFrederik Schwarzer2009-01-064-7/+7
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2009-01-067-137/+469
|\ \ \
| * \ \ Merge branch 'next' into for-linusJames Morris2009-01-077-137/+469
| |\ \ \ | | |/ / | |/| |
| | * | netlabel: Update kernel configuration APIPaul Moore2008-12-317-137/+469
* | | | s390: remove s390_root_dev_*()Mark McLoughlin2009-01-061-4/+3
|/ / /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-01-0530-493/+488
|\ \ \
| * | | pkt_sched: cls_u32: Fix locking in u32_change()Jarek Poplawski2009-01-051-1/+2
| * | | iucv: fix cpu hotplugHeiko Carstens2009-01-051-7/+11
| * | | af_iucv: Free iucv path/socket in path_pending callbackHendrik Brueckner2009-01-051-0/+5
| * | | af_iucv: avoid left over IUCV connections from failing connectsUrsula Braun2009-01-051-0/+7