[LinuxPPS] 8 Jul 19:14 - Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[linuxpps: Linus Torvalds <>]

Merge /pub/scm/linux/kernel/git/bart/ide-2.6  
  
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:  
qd65xx: fix PIO mode selection  
sis5513: adding PCI-ID  
  
drivers/ide/legacy/qd65xx.c  
drivers/ide/pci/sis5513.c  
include/linux/pci_ids.h

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=fe5a2de17e65d82b9d502da80ccb5a689d03fdd2