Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Aug 2006 00:33:59 +0000 (17:33 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Aug 2006 00:33:59 +0000 (17:33 -0700)
commitb26e3ce5fef9188b45ab2d81a7432f960773c2c0
tree648069535ac84fe2d4788fd6ba601581d175f3c8
parent364fe5fe776e5bde7f762c138c11fb1e9c07b1c7
parentc0a16887436244c7715510f01479c3cc10a4ecf0
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] ahci: skip protocol test altogether in spurious interrupt code