diff options
| author | Linus Torvalds <[email protected]> | 2008-01-10 22:31:16 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2008-01-10 22:31:16 +0000 |
| commit | 318851b08fb9d426a545f76e56f2cc049831fb40 (patch) | |
| tree | a7784215b1ba0564b865309042ed80d3d4b383e6 /fs/proc/array.c | |
| parent | NFSv4: Give the lock stateid its own sequence queue (diff) | |
| parent | trm290: do hook dma_host_{on,off} methods (take 2) (diff) | |
| download | kernel-318851b08fb9d426a545f76e56f2cc049831fb40.tar.gz kernel-318851b08fb9d426a545f76e56f2cc049831fb40.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
trm290: do hook dma_host_{on,off} methods (take 2)
ide: fix cable detection for SATA bridges
ide: workaround suspend bug for ACPI IDE
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions