diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-17 17:00:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-17 17:00:48 -0700 |
| commit | 2f8dd8505e005df1711722664d12865cc8b3da4d (patch) | |
| tree | 95c84410232aedf9ceed5094b3530b9f660b1634 /fs/namei.c | |
| parent | 360afb033277688f145030c80fd2853dbfaebba5 (diff) | |
| parent | 120b9cfddff2e398fece07c5e127f3fdbb660441 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: remove CONFIG_IDEDMA_{ICS,PCI}_AUTO config options
ide: don't allow DMA to be enabled if CONFIG_IDEDMA_{ICS,PCI}_AUTO=n
scc_pata: dependency fix
jmicron: make ide jmicron driver play nice with libata ones
ide: remove static prototypes from include/asm-mips/mach-au1x00/au1xxx_ide.h
ide: au1xxx: fix use of mixed declarations and code
cmd64x: fix recovery time calculation (take 3)
Diffstat (limited to 'fs/namei.c')
0 files changed, 0 insertions, 0 deletions