summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2007-10-1341-989/+484
|\
| * alim15x3: remove redundant m5229_revision checkBartlomiej Zolnierkiewicz2007-10-131-12/+13
| * sc1200: fix ->dma_base equal zero handlingBartlomiej Zolnierkiewicz2007-10-131-10/+14
| * cs5520: fix ->dma_base equal zero handlingBartlomiej Zolnierkiewicz2007-10-131-10/+9
| * sgiioc4: add missing ->dma_base checkBartlomiej Zolnierkiewicz2007-10-131-6/+10
| * cs5535: add missing ->dma_base checkBartlomiej Zolnierkiewicz2007-10-131-7/+7
| * ide: remove CONFIG_IDEDMA_IVB config optionBartlomiej Zolnierkiewicz2007-10-132-20/+0
| * ide: change master/slave IDENTIFY orderBartlomiej Zolnierkiewicz2007-10-132-5/+3
| * ide: move ide_config_drive_speed() calls to upper layers (take 2)Bartlomiej Zolnierkiewicz2007-10-1336-521/+304
| * pdc202xx_new: check ide_config_drive_speed() return valueBartlomiej Zolnierkiewicz2007-10-131-3/+3
| * cs5535: check ide_config_drive_speed() return valueBartlomiej Zolnierkiewicz2007-10-131-2/+6
| * amd74xx/via82cxxx: check ide_config_drive_speed() return valueBartlomiej Zolnierkiewicz2007-10-132-14/+6
| * au1xxx: fix au1xxx_set_pio_mode()Bartlomiej Zolnierkiewicz2007-10-131-4/+3
| * icside: use ide_tune_dma()Bartlomiej Zolnierkiewicz2007-10-133-44/+17
| * ide-pmac: fix PIO setup and enable autotuneBenjamin Herrenschmidt2007-10-131-8/+12
| * ide-pmac: use ide_tune_dma() (take 2)Bartlomiej Zolnierkiewicz2007-10-131-18/+7
| * ide-pmac: remove pmac_ide_do_setfeature() (take 2)Bartlomiej Zolnierkiewicz2007-10-134-80/+18
| * ide-pmac: remove nIEN clearing from pmac_ide_do_setfeature()Bartlomiej Zolnierkiewicz2007-10-131-1/+0
| * ide-pmac: use __ide_wait_stat()Bartlomiej Zolnierkiewicz2007-10-133-35/+7
| * ide-pmac: remove extra good status wait from pmac_ide_do_setfeature()Bartlomiej Zolnierkiewicz2007-10-131-11/+1
| * ide: add __ide_wait_stat() helperBartlomiej Zolnierkiewicz2007-10-132-62/+45
| * ide-pmac: remove pmac_ide_{m,u}dma_enable() (take 2)Bartlomiej Zolnierkiewicz2007-10-131-98/+4
| * ide-pmac: remove control register messing from pmac_ide_dma_check()Bartlomiej Zolnierkiewicz2007-10-131-1/+1
| * ide-pmac: fix set_timings_mdma()Bartlomiej Zolnierkiewicz2007-10-131-28/+12
| * ide-pmac: pmac_ide_tune_chipset() fixesBartlomiej Zolnierkiewicz2007-10-131-11/+16
| * ide-pmac: don't check kauai_lookup_timing() return valueBartlomiej Zolnierkiewicz2007-10-131-12/+1
| * ide: unexport ide_acpi_set_stateAdrian Bunk2007-10-131-1/+0
| * ide_platform: set hwif->chipsetBartlomiej Zolnierkiewicz2007-10-131-1/+1
* | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2007-10-1391-2226/+4671
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David Woodhouse2007-10-134538-135588/+352156
| |\ \ | | |/
| * | Merge Linux 2.6.23David Woodhouse2007-10-131054-21076/+60736
| |\ \
| * | | [MTD] [NAND] Blackfin on-chip NAND Flash Controller driverBryan Wu2007-10-135-0/+856
| * | | [MTD] [NOR] fix ctrl-alt-del can't reboot for intel flash bugKevin Hao2007-10-132-3/+7
| * | | [MTD] [NAND] Fix compiler warning in Alauda driverakpm@linux-foundation.org2007-10-131-1/+1
| * | | [JFFS2] Remove stray debugging printkDavid Woodhouse2007-10-131-3/+1
| * | | [JFFS2] Handle dirents on the flash with embedded zero bytes in names.David Woodhouse2007-10-133-9/+35
| * | | [JFFS2] Check for creation of dirents with embedded zero bytes in name.David Woodhouse2007-10-131-1/+12
| * | | [JFFS2] Don't count all 'very dirty' blocks except in debug modeDavid Woodhouse2007-10-131-1/+3
| * | | [JFFS2] Check whether garbage-collection actually obsoleted its victim.David Woodhouse2007-10-131-2/+12
| * | | [JFFS2] Relax threshold for triggering GC due to dirty blocks.David Woodhouse2007-10-131-1/+1
| * | | [MTD] [OneNAND] Fix typo related with recent commitKyungmin Park2007-10-131-1/+1
| * | | [JFFS2] Trigger garbage collection when very_dirty_list size becomes excessiveDavid Woodhouse2007-10-063-2/+24
| * | | [MTD] [NAND] Avoid deadlock in erase callback; release chip lock first.David Woodhouse2007-10-061-3/+4
| * | | [MTD] [NAND] Resume method for CAFÉ NAND controllerDavid Woodhouse2007-10-061-3/+39
| * | | [MTD] [NAND] Fix PCI ident table for CAFÉ NAND controller.David Woodhouse2007-10-061-1/+7
| * | | Merge branch 'master' of ssh://git.infradead.org/srv/git/mtd-2.6David Woodhouse2007-10-061-2/+2
| |\ \ \
| | * | | [MTD] [NAND] s3c2410: fix arch movesBen Dooks2007-09-251-2/+2
| * | | | [MTD] [OneNAND] fix numerous racesArtem Bityutskiy2007-09-231-75/+95
| |/ / /
| * | | [MTD] map driver for NOR flash on the Intel Vermilion Range chipsetDavid Woodhouse2007-09-233-0/+306
| * | | [JFFS2] Fix unpoint lengthAndy Lowe2007-09-233-3/+3