summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2008-10-2033-1171/+815
|\
| * ide: re-add TRM290 fix lost during ide_build_dmatable() cleanupBartlomiej Zolnierkiewicz2008-10-171-1/+1
| * scc_pata: kill unused variablesSergei Shtylyov2008-10-171-4/+0
| * sgiioc4: kill duplicate ioremap()Sergei Shtylyov2008-10-171-12/+2
| * sgiioc4: kill useless address checksSergei Shtylyov2008-10-171-17/+9
| * delkin_cb: add PM supportBartlomiej Zolnierkiewicz2008-10-171-7/+56
| * ide: remove broken hpt34x driverBartlomiej Zolnierkiewicz2008-10-173-217/+1
| * ide-floppy: remove idefloppy_floppy_t typedefBartlomiej Zolnierkiewicz2008-10-173-15/+13
| * sgiioc4: remove maskproc() methodSergei Shtylyov2008-10-171-9/+0
| * hpt366: cleanup maskproc() methodSergei Shtylyov2008-10-171-18/+16
| * ide: mask interrupt in ide_config_drive_speed()Sergei Shtylyov2008-10-171-1/+1
| * hpt366: fix compile warningBartlomiej Zolnierkiewicz2008-10-171-1/+0
| * ide: remove unused macros from <asm-parisc/ide.h>Bartlomiej Zolnierkiewicz2008-10-171-4/+0
| * ide: remove M68K_IDE_SWAPW define from <asm-m68k/ide.h>Bartlomiej Zolnierkiewicz2008-10-171-9/+0
| * ide: remove dead <asm-arm/arch-sa1100/ide.h>Bartlomiej Zolnierkiewicz2008-10-171-75/+0
| * ide: fix support for IDE PCI controllers using MMIO on frvBartlomiej Zolnierkiewicz2008-10-171-9/+1
| * ide-cd: remove stale commentBorislav Petkov2008-10-171-4/+0
| * ide-cd: small drive type print fixBorislav Petkov2008-10-171-1/+1
| * ide-cd: debug log enhancementsBorislav Petkov2008-10-171-12/+21
| * ide: add generic ATA/ATAPI disk driverBartlomiej Zolnierkiewicz2008-10-1713-455/+303
| * ide: allow device drivers to specify per-device type /proc settingsBartlomiej Zolnierkiewicz2008-10-177-22/+74
| * ide: prepare for merging ide-gd-floppy.c with ide-gd.cBartlomiej Zolnierkiewicz2008-10-173-92/+91
| * ide-floppy: factor out generic disk handling code to ide-gd-floppy.cBartlomiej Zolnierkiewicz2008-10-174-311/+327
| * ide-disk: use IDE_DFLAG_MEDIA_CHANGEDBartlomiej Zolnierkiewicz2008-10-171-2/+6
| * ide-disk: factor out generic disk handling code to ide-gd.cBartlomiej Zolnierkiewicz2008-10-175-299/+314
| * ide: remove IDE_AFLAG_NO_DOORLOCKINGBartlomiej Zolnierkiewicz2008-10-177-8/+7
| * ide: IDE_AFLAG_FORMAT_IN_PROGRESS -> IDE_DFLAG_FORMAT_IN_PROGRESSBartlomiej Zolnierkiewicz2008-10-173-8/+7
| * ide: IDE_AFLAG_WP -> IDE_DFLAG_WPBartlomiej Zolnierkiewicz2008-10-172-6/+6
| * ide: IDE_AFLAG_MEDIA_CHANGED -> IDE_DFLAG_MEDIA_CHANGEDBartlomiej Zolnierkiewicz2008-10-174-10/+10
| * ide-floppy: use drive->capacity64 for caching current capacityBartlomiej Zolnierkiewicz2008-10-171-10/+13
| * ide-floppy: drop 'floppy' argument from idefloppy_setup()Bartlomiej Zolnierkiewicz2008-10-171-2/+3
| * ide-{disk,floppy}: set IDE_DFLAG_ATTACH in *_setup()Bartlomiej Zolnierkiewicz2008-10-172-9/+12
| * ide-disk: move IDE_DFLAG_DOORLOCKING flag handling to idedisk_set_doorlock()Bartlomiej Zolnierkiewicz2008-10-171-9/+13
| * ide-disk: use to_ide_drv() and ide_drv_g()Bartlomiej Zolnierkiewicz2008-10-173-12/+7
| * ide-floppy: use alloc_disk_node()Bartlomiej Zolnierkiewicz2008-10-171-1/+1
| * ide-disk: lock media before checking for media changeBartlomiej Zolnierkiewicz2008-10-171-1/+1
| * ide-disk: fix IDE_DFLAG_LBA48 handling on resumeBartlomiej Zolnierkiewicz2008-10-171-20/+20
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2008-10-206-208/+116
|\ \
| * | fsldma: allow Freescale Elo DMA driver to be compiled as a moduleTimur Tabi2008-09-263-55/+94
| * | fsldma: remove internal self-test from Freescale Elo DMA driverTimur Tabi2008-09-231-132/+0
| * | drivers/dma/dmatest.c: switch a GFP_ATOMIC to GFP_KERNELAndrew Morton2008-09-191-1/+1
| * | dmatest: properly handle duplicate DMA channelsTimur Tabi2008-09-191-0/+5
| * | drivers/dma/ioat_dma.c: drop code after returnJulia Lawall2008-09-131-2/+0
| * | async_tx: make async_tx_run_dependencies() easier to readDan Williams2008-09-131-18/+16
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds2008-10-201-1/+1
|\ \ \
| * | | [WATCHDOG] ib700wdt.c - fix buffer_underflow bugWim Van Sebroeck2008-10-151-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/msz...Linus Torvalds2008-10-205-3/+24
|\ \ \ \
| * | | | fuse: implement nonseekable openTejun Heo2008-10-162-1/+8
| * | | | fuse: add include protectorsTejun Heo2008-10-162-0/+10
| * | | | fuse: config description improvementRobert P. J. Day2008-10-161-1/+1
OpenPOWER on IntegriCloud