projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 06da035 e58c5de)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:07:48 +0000 (17:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Jun 2012 00:07:48 +0000 (17:07 -0700)
commit8e53ed10f871a077cc61374c74e0bbab25264208
tree13c12409e016c7ea9fba8a4aa7ef5329b289444atree | snapshot
parent06da03510e0cf669a2c434484b90c0ab09d2b086commit | diff
parente58c5de8f59d124907c993ea3126c69493b7eec7commit | diff
Merge git://git./linux/kernel/git/davem/ide

Pull IDE fixes from David S. Miller:

1) Two fixes to icside, one for a build failure and another for a
   warning.  From Christian Dietrich.

2) Fix a bit operation that did erroneous masking, from Julia Lawall.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  drivers/ide/ide-cs.c: adjust suspicious bit operation
  ide: icside.c: fix printk format string compile warning
  ide: icside.c: Fix compile with CONFIG_BLK_DEV_IDEDMA_ICS=n
Unnamed repository; edit this file 'description' to name the repository.