diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 22:44:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-21 22:44:24 -0700 |
| commit | 14867719611278380c96213873066237b2758f3f (patch) | |
| tree | 4ae521e6d2f1960f29466ecc83fa3b8e0491a97f /fs | |
| parent | 8dcc3be2a4fdf0560c43ae30a149ac1e4b70495f (diff) | |
| parent | 5b40dd30bbfaa7fcba0cd945a4852a146c552ea7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE fixes from David Miller:
- fix interrupt registry for some Atari IDE chipsets.
- adjust Kconfig dependencies for x86_32 specific chips.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: Fix SC1200 dependencies
ide: Fix CS5520 and CS5530 dependencies
m68k/atari - ide: do not register interrupt if host->get_lock is set
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions