summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...Linus Torvalds2007-07-1843-173/+232
|\
| * [NETFILTER]: xt_connlimit needs to depend on nf_conntrackCornelia Huck2007-07-181-0/+1
| * [NETFILTER]: ipt_iprange.h must #include <linux/types.h>Adrian Bunk2007-07-181-0/+2
| * [IrDA]: Fix IrDA build failureSamuel Ortiz2007-07-188-9/+9
| * [ATM]: nicstar needs virt_to_busStephen Rothwell2007-07-181-1/+1
| * [NET]: move __dev_addr_discard adjacent to dev_addr_discard for readabilityDenis Cheng2007-07-181-14/+14
| * [NET]: merge dev_unicast_discard and dev_mc_discard into oneDenis Cheng2007-07-181-12/+4
| * [NET]: move dev_mc_discard from dev_mcast.c to dev.cDenis Cheng2007-07-183-15/+13
| * [NETLINK]: negative groups in netlink_setsockoptJohannes Berg2007-07-181-2/+3
| * [PPPOL2TP]: Reset meta-data in xmit functionPatrick McHardy2007-07-181-0/+6
| * [PPPOL2TP]: Fix use-after-freePatrick McHardy2007-07-181-4/+8
| * [PKT_SCHED]: Some typo fixes in net/sched/KconfigGabriel Craciunescu2007-07-181-3/+3
| * [XFRM]: Fix crash introduced by struct dst_entry reorderingPatrick McHardy2007-07-182-2/+1
| * [TCP]: remove unused argument to cong_avoid opStephen Hemminger2007-07-1814-28/+24
| * [ATM]: [idt77252] Rename CONFIG_ATM_IDT77252_SEND_IDLE to not resemble a Kcon...Robert P. J. Day2007-07-181-3/+3
| * [ATM]: [drivers] ioremap balanced with iounmapAmol Lad2007-07-182-9/+24
| * [ATM]: [lanai] sram_test_word() must be __devinitAdrian Bunk2007-07-181-2/+2
| * [ATM]: [nicstar] Replace C code with call to ARRAY_SIZE() macro.Robert P. J. Day2007-07-181-1/+1
| * [ATM]: Eliminate dead config variable CONFIG_BR2684_FAST_TRANS.Robert P. J. Day2007-07-181-4/+0
| * [ATM]: Replacing kmalloc/memset combination with kzalloc.vignesh babu2007-07-181-2/+1
| * [NET]: gen_estimator deadlock fixRanko Zivojnovic2007-07-181-32/+49
| * [BNX2]: Update version to 1.6.3.Michael Chan2007-07-181-2/+2
| * [BNX2]: Use constants for stats ticks.Michael Chan2007-07-181-4/+5
| * [BNX2]: Add delay before reading firmware version.Michael Chan2007-07-181-4/+12
| * [BNX2]: Support NVRAM on 5709.Michael Chan2007-07-182-30/+54
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp...Linus Torvalds2007-07-1812-261/+344
|\ \
| * | [SPARC64]: Set vio->desc_buf to NULL after freeing.David S. Miller2007-07-181-0/+1
| * | [SPARC]: Mark sparc and sparc64 as not having virt_to_busStephen Rothwell2007-07-183-5/+6
| * | [SPARC64]: Fix reset handling in VNET driver.David S. Miller2007-07-181-0/+2
| * | [SPARC64]: Handle reset events in vio_link_state_change().David S. Miller2007-07-181-0/+29
| * | [SPARC64]: Handle LDC resets properly in domain-services driver.David S. Miller2007-07-181-0/+19
| * | [SPARC64]: Massively simplify VIO device layer and support hot add/remove.David S. Miller2007-07-182-65/+60
| * | [SPARC64]: Simplify VNET probing.David S. Miller2007-07-182-132/+130
| * | [SPARC64]: Simplify VDC device probing.David S. Miller2007-07-181-87/+10
| * | [SPARC64]: Add basic infrastructure for MD add/remove notification.David S. Miller2007-07-183-3/+118
| |/
* | Merge branch 'xen-upstream' of ssh://master.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2007-07-18116-210/+15031
|\ \
| * | xen: disable all non-virtual driversJeremy Fitzhardinge2007-07-181-0/+2
| * | xen: use iret directly when possibleJeremy Fitzhardinge2007-07-185-5/+199
| * | xen: suppress abs symbol warnings for unused reloc pointersJeremy Fitzhardinge2007-07-181-0/+2
| * | xen: Attempt to patch inline versions of common operationsJeremy Fitzhardinge2007-07-185-54/+190
| * | xen: Place vcpu_info structure into per-cpu memoryJeremy Fitzhardinge2007-07-185-16/+164
| * | xen: handle external requests for shutdown, reboot and sysrqJeremy Fitzhardinge2007-07-182-1/+144
| * | xen: machine operationsJeremy Fitzhardinge2007-07-182-3/+44
| * | xen: add virtual network device driverJeremy Fitzhardinge2007-07-183-0/+1877
| * | xen: add virtual block device driver.Jeremy Fitzhardinge2007-07-184-0/+1000
| * | xen: add the Xenbus sysfs and virtual device hotplug driverJeremy Fitzhardinge2007-07-1810-0/+2961
| * | xen: Add grant table supportJeremy Fitzhardinge2007-07-185-10/+776
| * | xen: use the hvc console infrastructure for Xen consoleJeremy Fitzhardinge2007-07-187-1/+182
| * | xen: hack to prevent bad segment register reloadJeremy Fitzhardinge2007-07-181-0/+12
| * | xen: lazy-mmu operationsJeremy Fitzhardinge2007-07-183-32/+72