summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86Linus Torvalds2007-10-262-4/+4
|\
| * x86: fix bogus KERN_ALERT on oopsAlexey Dobriyan2007-10-241-1/+1
| * x86: lguest build fixJeff Garzik2007-10-241-0/+1
| * x86: fix CONFIG_KEXEC build breakageMike Galbraith2007-10-241-3/+3
* | Merge branch 'sg' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2007-10-2651-189/+134
|\ \
| * | fix sg_phys to use dma_addr_tHugh Dickins2007-10-251-1/+2
| * | ub: add sg_init_table for sense and read capacity commandsFUJITA Tomonori2007-10-251-0/+2
| * | x86: pci-gart fixFUJITA Tomonori2007-10-251-2/+1
| * | blackfin: fix sg falloutAdrian Bunk2007-10-241-0/+1
| * | xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include itJens Axboe2007-10-241-1/+1
| * | Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/...Jens Axboe2007-10-241-1/+1
| |\ \
| | * | AVR32: Fix sg_page breakageHaavard Skinnemoen2007-10-241-1/+1
| | |/
| * | SG: audit of drivers that use blk_rq_map_sg()Jens Axboe2007-10-243-5/+9
| * | arch/um/drivers/ubd_kern.c: fix a building errorWANG Cong2007-10-241-0/+2
| * | SG: Change sg_set_page() to take length and offset argumentJens Axboe2007-10-2431-161/+98
| * | mmc: sg falloutJens Axboe2007-10-245-8/+5
| * | m68k: sg falloutGeert Uytterhoeven2007-10-245-8/+7
| * | More SG build fixesDavid Miller2007-10-242-1/+2
| * | sg: add missing sg_init_table calls to zfcpHeiko Carstens2007-10-241-0/+2
| * | SG build fixDavid Miller2007-10-241-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguestLinus Torvalds2007-10-2617-299/+440
|\ \
| * | lguest: documentation updateRusty Russell2007-10-2516-266/+414
| * | lguest: Add to maintainers file.Rusty Russell2007-10-251-0/+7
| * | lguest: build fixJeff Garzik2007-10-251-0/+1
| * | lguest: clean up lguest_launcher.hRusty Russell2007-10-251-14/+4
| * | lguest: remove unused "wake" element from struct lguestRusty Russell2007-10-251-3/+0
| * | lguest: use defines from x86 headers instead of magic numbersRusty Russell2007-10-252-4/+3
| * | lguest: example launcher header cleanup.Rusty Russell2007-10-251-12/+11
| |/
* | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2007-10-265-49/+195
|\ \
| * | [libata] sata_nv: SWNCQ should not apply to MCP61Kuan Luo2007-10-251-3/+3
| * | libata-core: Be a bit more relaxed about early DMA zero devicesAlan Cox2007-10-251-3/+7
| * | ahci: ahci: implement workaround for ASUS P5W-DH Deluxe ahci_broken_hardreset...Tejun Heo2007-10-251-0/+144
| * | Fix pata_icside build for recent libata API changesAl Viro2007-10-251-20/+22
| * | libata: cosmetic clean up in ata_eh_reset()Tejun Heo2007-10-251-6/+6
| * | libata-core.c: make 2 functions staticAdrian Bunk2007-10-251-2/+2
| * | [libata] Create internal helper ata_dev_set_feature()Jeff Garzik2007-10-251-15/+11
| |/
* | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2007-10-2613-409/+149
|\ \
| * | [netdrvr] forcedeth: add MCP77 device IDsAyaz Abdulla2007-10-252-0/+20
| * | rndis_host: reduce MTU instead of refusing to talk to devices with low max pa...Thomas Sailer2007-10-251-5/+13
| * | cpmac: update to new fixed phy driver interfaceEugene Konev2007-10-251-18/+46
| * | cpmac: convert to napi_struct interfaceEugene Konev2007-10-251-31/+37
| * | cpmac: use print_mac() instead of MAC_FMTEugene Konev2007-10-251-9/+4
| * | natsemi: fix oops, link back netdevice from private-structIngo Molnar2007-10-251-0/+1
| * | ehea: fix port_napi_disable/enableJan-Bernd Themann2007-10-252-5/+4
| * | bonding/bond_main.c: fix cut'n'paste errorAdrian Bunk2007-10-251-1/+1
| * | make bonding/bond_main.c:bond_deinit() staticAdrian Bunk2007-10-252-2/+2
| * | drivers/net/ipg.c: cleanupsAdrian Bunk2007-10-252-21/+21
| * | remove Documentation/networking/net-modules.txtAdrian Bunk2007-10-252-317/+0
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-schedLinus Torvalds2007-10-2610-205/+292
|\ \
| * | sched: mark CONFIG_FAIR_GROUP_SCHED as !EXPERIMENTALIngo Molnar2007-10-241-1/+0