Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@woody.osdl.org>
Sat, 2 Dec 2006 00:46:22 +0000 (16:46 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Sat, 2 Dec 2006 00:46:22 +0000 (16:46 -0800)
commit9ba5aa3126873a9c29999b78de20a52c5f87d389
tree5ee7cc2c3465c3ef557f6f4e35e6c7cb67ece286
parentc3e59d1e891f6140a346de2b8547e25133c716b0
parenta17259a726c4c9806dc99bda5e904727de76b694
Merge branch 'upstream-linus' of /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