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)
commitefe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48
tree648069535ac84fe2d4788fd6ba601581d175f3c8
parent8861e98115f185d9946d92deaee6c3639ef8d414
parentf1d39b291e2263f5e2f2ec5d4061802f76d8ae67
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] ahci: skip protocol test altogether in spurious interrupt code