commit 3a4b7886ee59e122d359e1714ed89585a06645ad
author Linus Torvalds <torvalds@linux-foundation.org> Fri Aug 01 12:41:29 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Aug 01 12:41:29 2008 -0700
tree d4db00a37e7d3013f2c5f7cad9f6d83c8c0f4c29
parent b8a327be3fbf05b5d3a935b4c03a3dcdb6db833e
parent 963e4975c6f93c148ca809d986d412201df9af89

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_it821x: Driver updates and reworking
  libata.h: replace __FUNCTION__ with __func__
  ata_piix: subsys 106b:00a3 is apple ich8m too
  libata-core: make sure that ata_force_tbl is freed in case of an error
  libata: update atapi disable handling
  pata_via: add VX800 flag; add function for fixing h/w bugs
  pata_ali: misplaced pci_dev_put()