Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 13 Mar 2006 00:41:27 +0000 (16:41 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 13 Mar 2006 00:41:27 +0000 (16:41 -0800)
commit57ddd5c1803859d977c5a31a267d2c805ffe6e11
treebbc3e2a406f5ab2ddeb0ba0273867bee95b41612
parent7cafae52381395d24b83996eca7a7b53ab6a8827
parented071adc97a69785686a37fb88e100f41b482b94
Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/libata-dev

* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] ahci: fix NULL pointer dereference detected by Coverity