tree e02659c481b7beb61b9f63c88e4cd200a4369517
parent 7e4720201ad44ace85a443f41d668a62a737e7d0
parent 29da9f6d9cc3685ae7f6c8b817f6ed8864c78a4c
author Linus Torvalds <torvalds@g5.osdl.org> 1159237922 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1159237922 -0700

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:
  [libata] Fix oops introduced in non-uniform port handling fix
  [PATCH] ata-piix: fixes kerneldoc error