From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Sep 2009 18:40:15 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
X-Git-Tag: v2.6.31~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cbeb2864b162f4298111196c8ce8ce492577cdee;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  pcmcia: add CNF-CDROM-ID for ide
---

cbeb2864b162f4298111196c8ce8ce492577cdee