projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8dcc3be 5b40dd3)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jul 2014 05:44:24 +0000 (22:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jul 2014 05:44:24 +0000 (22:44 -0700)
commit14867719611278380c96213873066237b2758f3f
tree4ae521e6d2f1960f29466ecc83fa3b8e0491a97ftree | snapshot
parent8dcc3be2a4fdf0560c43ae30a149ac1e4b70495fcommit | diff
parent5b40dd30bbfaa7fcba0cd945a4852a146c552ea7commit | diff
Merge git://git./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
John Crispins staging tree