tree 5ee7cc2c3465c3ef557f6f4e35e6c7cb67ece286
parent c3e59d1e891f6140a346de2b8547e25133c716b0
parent a17259a726c4c9806dc99bda5e904727de76b694
author Linus Torvalds <torvalds@woody.osdl.org> 1165020382 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> 1165020382 -0800

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] libata: add missing sht->slave_destroy
  [PATCH] ahci: ignore PORT_IRQ_IF_ERR on JMB controllers