From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Aug 2012 04:49:56 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
X-Git-Tag: v3.6-rc4~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=270868f6e654b2c37627bba52c62f352735f99ba;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

Pull IDE power management bugfix from David S. Miller.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: fix generic_ide_suspend/resume Oops
---

270868f6e654b2c37627bba52c62f352735f99ba