pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff

author	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Tue, 11 Sep 2007 21:47:23 +0000 (14:47 -0700)
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>
	Tue, 11 Sep 2007 21:47:23 +0000 (14:47 -0700)

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  pdc202xx_new: PLL detection fix
  via82cxxx: add Arima W730-K8 and other rebadgings to short cables list
  pmac: build fix
  pata_ali/alim15x3: override 80-wire cable detection for Toshiba S1800-814
  hpt366: UltraDMA filter for SATA cards (take 2)
  ide: add ide_dev_is_sata() helper (take 2)
  hpt366: fix PCI clock detection for HPT374 (take 4)
  pdc202xx_new: fix PCI refcounting
  ide: fix PCI refcounting
  mpc8xx: Only build mpc8xx on arch/ppc

Trivial merge