tree 95c84410232aedf9ceed5094b3530b9f660b1634
parent 360afb033277688f145030c80fd2853dbfaebba5
parent 120b9cfddff2e398fece07c5e127f3fdbb660441
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1174176048 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1174176048 -0700

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)