summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-08 11:59:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-08 11:59:06 -0700
commitdf87f344efac96cb9f9367e82509208216f1e0fa (patch)
treee5423f3973852736438382576f8a432d67e11713 /net
parent385c51d6b1dc7cdbbb1b189d18bb4680d0714a37 (diff)
parent032665a26f5fe230509c4d35bd53f69fb6aa45b0 (diff)
downloadlinux-3.10-df87f344efac96cb9f9367e82509208216f1e0fa.tar.gz
linux-3.10-df87f344efac96cb9f9367e82509208216f1e0fa.tar.bz2
linux-3.10-df87f344efac96cb9f9367e82509208216f1e0fa.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: Revert "Revert "ide: try to use PIO Mode 0 during probe if possible"" sis5513: fix PIO setup for ATAPI devices
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions