summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-06-3023-65/+236
|\
| * [IPV6]: Added GSO support for TCPv6Herbert Xu2006-06-3010-26/+24
| * [NET]: Generalise TSO-specific bits from skb_setup_capsHerbert Xu2006-06-306-14/+26
| * [IPV6]: Added GSO support for TCPv6Herbert Xu2006-06-305-2/+72
| * [IPV6]: Remove redundant length check on inputHerbert Xu2006-06-301-6/+1
| * [NETFILTER]: SCTP conntrack: fix crash triggered by packet without chunksPatrick McHardy2006-06-302-2/+2
| * [TG3]: Update version and reldateMichael Chan2006-06-301-2/+2
| * [TG3]: Add TSO workaround using GSOMichael Chan2006-06-302-5/+51
| * [TG3]: Turn on hw fix for ASF problemsMichael Chan2006-06-302-2/+7
| * [TG3]: Add rx BD workaroundMichael Chan2006-06-302-2/+29
| * [TG3]: Add tg3_netif_stop() in vlan functionsMichael Chan2006-06-301-0/+12
| * [TCP]: Reset gso_segs if packet is dodgyHerbert Xu2006-06-301-4/+10
* | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan...Linus Torvalds2006-06-302-1/+2
|\ \
| * | IB/core: Set alternate port number when initializing QP attributesSean Hefty2006-06-301-0/+1
| * | IB/uverbs: Set correct user handle for user SRQsRoland Dreier2006-06-301-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2006-06-303018-3092/+95
|\ \
| * | Remove obsolete #include <linux/config.h>Jörn Engel2006-06-302972-2976/+0
| * | remove obsolete swsusp_encryptPavel Machek2006-06-301-12/+0
| * | arch/arm26/Kconfig typosMatt LaPlante2006-06-301-3/+3
| * | Documentation/IPMI typosMatt LaPlante2006-06-301-2/+2
| * | Kconfig: Typos in net/sched/KconfigMatt LaPlante2006-06-301-4/+4
| * | v9fs: do not include linux/version.hPaul Collins2006-06-302-2/+0
| * | Documentation/DocBook/mtdnand.tmpl: typo fixesPatrick Pletscher2006-06-301-3/+3
| * | typo fixes: specfic -> specificAdrian Bunk2006-06-303-3/+3
| * | typo fixes in Documentation/networking/pktgen.txtAdrian Bunk2006-06-301-1/+1
| * | typo fixes: occuring -> occurringAdrian Bunk2006-06-3013-13/+13
| * | typo fixes: infomation -> informationAdrian Bunk2006-06-307-13/+13
| * | typo fixes: disadvantadge -> disadvantageAdrian Bunk2006-06-302-2/+2
| * | typo fixes: aquire -> acquireAdrian Bunk2006-06-309-30/+30
| * | typo fixes: mecanism -> mechanismAdrian Bunk2006-06-308-8/+8
| * | typo fixes: bandwith -> bandwidthAdrian Bunk2006-06-308-14/+14
| * | fix a typo in the RTC_CLASS help textAdrian Bunk2006-06-301-1/+1
| * | smb is no longer maintainedAdrian Bunk2006-06-301-7/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/Linus Torvalds2006-06-3014-91/+291
|\ \ \
| * | | [PATCH] pcmcia: fix deadlock in pcmcia_parse_eventsArjan van de Ven2006-06-301-2/+3
| * | | [PATCH] com20020_cs: more device supportMarc Sowen2006-06-301-1/+4
| * | | [PATCH] au1xxx: pcmcia: fix __init called from non-initDomen Puncer2006-06-301-1/+1
| * | | [PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV()Al Viro2006-06-301-6/+1
| * | | [PATCH] pcmcia: convert pcmcia_cs to kthreadSerge E. Hallyn2006-06-301-11/+13
| * | | [PATCH] pcmcia: fix kernel-doc function nameRandy Dunlap2006-06-301-1/+1
| * | | [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_csKomuro2006-06-301-1/+1
| * | | [PATCH] pcmcia: at91_cf suspend/resume/wakeupDavid Brownell2006-06-301-16/+59
| * | | [PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO spac...Thomas Kleffel2006-06-301-10/+71
| * | | [PATCH] pcmcia: TI PCIxx12 CardBus controller supportAlex Williamson2006-06-303-0/+3
| * | | [PATCH] pcmcia: warn if driver requests exclusive, but gets a shared IRQAlan Cox2006-06-301-9/+18
| * | | [PATCH] pcmcia: expose tool in pcmcia/Documentation/pcmcia/Randy Dunlap2006-06-302-33/+35
| * | | [PATCH] pcmcia: another ID for serial_cs.cDominik Brodowski2006-06-301-0/+1
| * | | [PATCH] yenta: fix hidden PCI bus numbersBernhard Kaindl2006-06-301-0/+73
| * | | [PATCH] yenta: do power-up only after socket is configuredDaniel Ritz2006-06-301-1/+8
| | |/ | |/|
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvbLinus Torvalds2006-06-3049-548/+524
|\ \ \
OpenPOWER on IntegriCloud