| commit | df89f1ba971b3df2b7e1bc46ca7ce867539186fa | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 18 Apr 2009 19:07:25 +0000 (18 12:07 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 18 Apr 2009 19:07:25 +0000 (18 12:07 -0700) | ||
| tree | 85a3ec9204bb7147e10545b1563ce5a2a0dd173e | treesnapshot (tar.gz zip) |
| parent | 62f2730a11b6fbd6ac274dcf1bc8251abe8d2205 | commitdiff |
| parent | 15da90b516e9da92cc1d90001e640fd6707d0e27 | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/bart/ide-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
cs5536: define dma_sff_read_status() method
ide: fix barriers support
ide: Remove void casts
hpt366: use ATA_DMA_* constants
hpt366: fix HPT370 DMA timeouts
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
cs5536: define dma_sff_read_status() method
ide: fix barriers support
ide: Remove void casts
hpt366: use ATA_DMA_* constants
hpt366: fix HPT370 DMA timeouts