diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 11:59:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 11:59:06 -0700 |
commit | df87f344efac96cb9f9367e82509208216f1e0fa (patch) | |
tree | e5423f3973852736438382576f8a432d67e11713 /drivers/net/pasemi_mac_ethtool.c | |
parent | 385c51d6b1dc7cdbbb1b189d18bb4680d0714a37 (diff) | |
parent | 032665a26f5fe230509c4d35bd53f69fb6aa45b0 (diff) |
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 'drivers/net/pasemi_mac_ethtool.c')
0 files changed, 0 insertions, 0 deletions