Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Sep 2009 18:40:15 +0000 (11:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Sep 2009 18:40:15 +0000 (11:40 -0700)
commitcbeb2864b162f4298111196c8ce8ce492577cdee
tree0ddc68c3c1231a38955d7fca71a28cfc43eb0996
parentf69fb9c39868463f6b0b8306824341bd5610250b
parentc9a2bfd1f08973115c2fc3da9372e0e81ac42a19
Merge git://git./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