From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Dec 2014 23:40:30 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: firefly_0821_release~176^2~2694
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=55437989bd4725a8d3371924babe2cb7ea882bfb;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/davem/ide

Pull IDE update from David Miller:
 "Two small IDE layer adjustments"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  drivers: ide: Fix mostly harmless off-by-one hardcoded value
  IDE: Deletion of an unnecessary check before the function call "module_put"
---

55437989bd4725a8d3371924babe2cb7ea882bfb