summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* KVM: cleanup memslot_id functionXiao Guangrong2011-05-112-18/+5
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-1040-232/+422
|\
| * Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6David S. Miller2011-05-1014-161/+279
| |\
| | * netfilter: revert a2361c8735e07322023aedc36e4938b35af31eb0Pablo Neira Ayuso2011-05-101-5/+0
| | * netfilter: IPv6: fix DSCP mangle codeFernando Luis Vazquez Cao2011-05-101-1/+1
| | * netfilter: IPv6: initialize TOS field in REJECT target moduleFernando Luis Vazquez Cao2011-05-101-1/+3
| | * IPVS: init and cleanup restructuringHans Schillstrom2011-05-108-80/+223
| | * IPVS: Change of socket usage to enable name space exit.Hans Schillstrom2011-05-102-22/+38
| | * netfilter: ebtables: only call xt_compat_add_offset once per ruleFlorian Westphal2011-05-101-52/+9
| | * netfilter: fix ebtables compat supportEric Dumazet2011-05-102-3/+4
| | * netfilter: ctnetlink: fix timestamp support for new conntracksPablo Neira Ayuso2011-05-101-0/+4
| * | slcan: fix ldisc->open retvalOliver Hartkopp2011-05-101-1/+3
| * | net/usb: mark LG VL600 LTE modem ethernet interface as WWANDan Williams2011-05-101-1/+1
| * | xfrm: Don't allow esn with disabled anti replay detectionSteffen Klassert2011-05-101-0/+3
| * | xfrm: Assign the inner mode output function to the dst entrySteffen Klassert2011-05-106-6/+27
| * | net: dev_close() should check IFF_UPEric Dumazet2011-05-101-4/+6
| * | vlan: fix GVRP at dismantle timeEric Dumazet2011-05-102-3/+3
| * | pch_gbe: support ML7223 IOHTomoya2011-05-092-1/+18
| * | PCH_GbE : Fixed the issue of checksum judgmentToshiharu Okada2011-05-091-5/+4
| * | PCH_GbE : Fixed the issue of collision detectionToshiharu Okada2011-05-091-2/+1
| * | NET: slip, fix ldisc->open retvalMatvejchikov Ilya2011-05-091-1/+3
| * | be2net: Fixed bugs related to PVID.Somnath Kotur2011-05-093-8/+14
| * | ehea: fix wrongly reported speed and portKleber Sacilotto de Souza2011-05-091-8/+13
| * | tcp_cubic: limit delayed_ack ratio to prevent divide errorstephen hemminger2011-05-081-2/+7
| * | ipheth: Properly distinguish length and alignment in URBs and skbsBen Hutchings2011-05-081-5/+9
| * | vmxnet3: Consistently disable irqs when taking adapter->cmd_lockRoland Dreier2011-05-061-4/+6
| * | dccp: handle invalid feature options lengthDan Rosenberg2011-05-061-0/+2
| |/
| * can: fix SJA1000 dlc for RTR packetsKurt Van Dijck2011-05-051-1/+1
| * usbnet: runtime pm: fix out of memoryMing Lei2011-05-051-3/+7
| * net: ip_expire() must revalidate routeEric Dumazet2011-05-041-16/+15
* | slub: Revert "[PARISC] slub: fix panic with DISCONTIGMEM"David Rientjes2011-05-101-1/+0
* | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2011-05-1032-97/+80
|\ \
| * | MIPS: Alchemy: fix xxs1500 build errorManuel Lauss2011-05-101-3/+2
| * | MIPS: Invalidate old TLB mappings when updating huge page PTEs.David Daney2011-05-101-0/+1
| * | MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kbWu Zhangjin2011-05-101-1/+1
| * | MIPS: JZ4740: Set one-shot feature flag for the clockeventLars-Peter Clausen2011-05-101-1/+1
| * | MIPS: JZ4740: Export symbols to the watchdog driver moduleRalf Baechle2011-05-101-0/+2
| * | MIPS: JZ4740: Fix GCC 4.6.0 build error.Ralf Baechle2011-05-101-3/+1
| * | MIPS: Audit: Fix success success argument pass to audit_syscall_exitRalf Baechle2011-05-101-2/+2
| * | MIPS: Fix calc_vmlinuz_load_addr build warnings.Ralf Baechle2011-05-101-1/+1
| * | MIPS: Alchemy: Fix GCC 4.6.0 build error.Ralf Baechle2011-05-101-28/+33
| * | MIPS: Document former use of timerfd(2) syscall number.Ralf Baechle2011-05-104-4/+4
| * | MIPS: IP27: Fix GCC 4.6.0 build error.Ralf Baechle2011-05-101-2/+1
| * | MIPS: IP27: Fix GCC 4.6.0 build error.Ralf Baechle2011-05-101-3/+0
| * | MIPS: bcm63xx: Fix header_crc comment in bcm963xx_tag.hJonas Gorski2011-05-101-1/+1
| * | MIPS: Octeon: Guard the Kconfig body with CPU_CAVIUM_OCTEONDavid Daney2011-05-101-11/+4
| * | MIPS: Octeon: Cleanup Kconfig IRQ_CPU* symbols.David Daney2011-05-101-5/+0
| * | MIPS: Rename .data..mostly and properly handle it in linker scriptCatalin Marinas2011-05-102-1/+2
| * | MIPS: MSP: Fix build errorRalf Baechle2011-05-101-0/+3
| * | MIPS: MSP71xx: Fix typo in msp_per_irq_controllerYoichi Yuasa2011-05-101-1/+1
OpenPOWER on IntegriCloud