]> err.no Git - linux-2.6/commitdiff
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)
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] ahci: fix NULL pointer dereference detected by Coverity


Trivial merge