summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linusLinus Torvalds2010-03-0518-128/+335
|\
| * Squashfs: get rid of obsolete definition in header filePhillip Lougher2010-03-051-2/+0
| * Squashfs: get rid of obsolete variable in struct squashfs_sb_infoPhillip Lougher2010-03-051-1/+0
| * Squashfs: add decompressor entries for lzma and lzoPhillip Lougher2010-01-202-1/+13
| * Squashfs: add a decompressor frameworkPhillip Lougher2010-01-208-51/+184
| * Squashfs: factor out remaining zlib dependencies into separate wrapper filePhillip Lougher2010-01-2014-33/+51
| * Squashfs: move zlib decompression wrapper code into a separate filePhillip Lougher2010-01-204-71/+118
* | Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osdLinus Torvalds2010-03-045-203/+779
|\ \
| * | exofs: groups supportBoaz Harrosh2010-02-283-37/+141
| * | exofs: Prepare for groupsBoaz Harrosh2010-02-281-60/+99
| * | exofs: Error recovery if object is missing from storageBoaz Harrosh2010-02-281-1/+11
| * | exofs: convert io_state to use pages array instead of bio at inputBoaz Harrosh2010-02-283-61/+71
| * | exofs: RAID0 supportBoaz Harrosh2010-02-284-83/+333
| * | exofs: Define on-disk per-inode optional layout attributeBoaz Harrosh2010-02-284-10/+114
| * | exofs: unindent exofs_sbi_readBoaz Harrosh2010-02-281-49/+38
| * | exofs: Move layout related members to a layout structureBoaz Harrosh2010-02-284-54/+71
| * | exofs: Recover in the case of read-passed-end-of-fileBoaz Harrosh2010-02-281-6/+30
| * | exofs: Micro-optimize exofs_i_infoBoaz Harrosh2010-02-281-2/+2
| * | exofs: debug print even lessBoaz Harrosh2010-02-282-16/+45
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2010-03-0417-276/+99
|\ \ \
| * | | sparc64: Make prom entry spinlock NMI safe.David S. Miller2010-03-031-5/+7
| * | | sparc64: Kill off old sys_perfctr system call and state.David S. Miller2010-03-0312-247/+18
| * | | sparc: Update defconfigs.David S. Miller2010-03-032-24/+66
| * | | sparc: Provide io{read,write}{16,32}be().David S. Miller2010-03-032-0/+8
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6Linus Torvalds2010-03-0452-678/+617
|\ \ \ \
| * \ \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/id...David S. Miller2010-03-026-63/+81
| |\ \ \ \
| | * | | | ide: fixed section mismatch warning in cmd640.cChris Frey2010-01-281-1/+1
| | * | | | ide/ide-cs: fix order of releasing resourcesWolfram Sang2010-01-151-12/+11
| | * | | | ide: Fix Promise UDMA33 IDE driver (pdc202xx_old)Russell King2010-01-121-2/+2
| | * | | | icside: bring back ->maskproc methodBartlomiej Zolnierkiewicz2010-01-121-4/+60
| | * | | | scc_pata: fix module unloadingBartlomiej Zolnierkiewicz2010-01-081-7/+5
| | * | | | ide: doc: remove compilation options section from ide-cd documentationThadeu Lima de Souza Cascardo2009-12-131-37/+2
| * | | | | drivers/ide: Fix continuation line formatsJoe Perches2010-02-032-4/+4
| * | | | | ide: ide_timing_compute() fixupBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | | | | ide: make ide_get_best_pio_mode() staticBartlomiej Zolnierkiewicz2010-01-192-3/+1
| * | | | | via82cxxx: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | | | | tx493xide: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-192-2/+2
| * | | | | siimage: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | | | | palm_bk3710: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | | | | it821x: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | | | | cs5536: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | | | | cs5535: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | | | | cmd64x: fix handling of address setup timingsBartlomiej Zolnierkiewicz2010-01-191-7/+10
| * | | | | amd74xx: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | | | | alim15x3: fix handling of UDMA enable bitBartlomiej Zolnierkiewicz2010-01-191-25/+18
| * | | | | alim15x3: fix handling of DMA timingsBartlomiej Zolnierkiewicz2010-01-191-16/+39
| * | | | | alim15x3: fix handling of command timingsBartlomiej Zolnierkiewicz2010-01-191-2/+7
| * | | | | alim15x3: fix handling of address setup timingsBartlomiej Zolnierkiewicz2010-01-191-0/+11
| * | | | | ide-timings: use ->pio_mode value to determine fastest PIO speedBartlomiej Zolnierkiewicz2010-01-191-3/+2
| * | | | | ide: change ->set_dma_mode method parametersBartlomiej Zolnierkiewicz2010-01-1936-87/+101