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

[gitweb.enneenne.com Git - linuxpps/rss log: Linus Torvalds <>]

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
    

  * [[D][1][H][2]] drivers/ide/ide-cs.c

   [1]: http://gitweb.enneenne.com/?p=linuxpps;a=blobdiff;f=drivers/ide/ide-cs.c;fp=drivers/ide/ide-cs.c;h=063b933d864a81f04acc0bbabdce2ec0297b7088;hp=527908ff298c408c0f86fdf24363ea9c70d6e652;hb=cbeb2864b162f4298111196c8ce8ce492577cdee;hpb=f69fb9c39868463f6b0b8306824341bd5610250b (diff)
   [2]: http://gitweb.enneenne.com/?p=linuxpps;a=history;f=drivers/ide/ide-cs.c;h=cbeb2864b162f4298111196c8ce8ce492577cdee (history)

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commitdiff;h=cbeb2864b162f4298111196c8ce8ce492577cdee