diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 09:50:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 09:50:55 -0800 |
| commit | a58695bb9d63764da9607bf1e7ff09ef03b190a8 (patch) | |
| tree | 07ddae612b3f76769afad56ba99d225a65efee7e /net/netfilter | |
| parent | 413623e70765ffd5679c600aea28022e23d9f44b (diff) | |
| parent | 0fb18c4777ff424c1db694af98443a201fa4fc30 (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 "ide: try to use PIO Mode 0 during probe if possible"
Diffstat (limited to 'net/netfilter')
0 files changed, 0 insertions, 0 deletions