From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 16 Jun 2012 00:07:48 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8e53ed10f871a077cc61374c74e0bbab25264208;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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
---

8e53ed10f871a077cc61374c74e0bbab25264208