diff options
| author | Linus Torvalds | 2010-03-29 09:37:57 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-03-29 09:37:57 -0700 |
| commit | ad4ba059005f18ec9e274966c16d99fc5ce8b2cd (patch) | |
| tree | 4ac79d10d435c778dbc712146732044be9d3af82 /fs | |
| parent | f7454c5d5c33b84fdbb957b7ad4a432e333b2550 (diff) | |
| parent | 9ce41aed0d392246eb788786253f242e829fd5e1 (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: skip probe if there are no devices on the port (v2)"
Revert "via82cxxx: workaround h/w bugs"
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions