Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Dec 2008 22:40:48 +0000 (14:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Dec 2008 22:40:48 +0000 (14:40 -0800)
commit0099f77e0a224cc461d0d2930ef0fdb32c61ba64
treec4f6252067f6d581779eba4039020279ce11c5f3
parent2e8569669805c2d2620527464c395279b74892fc
parent9ecab6e5bf87f96dc2fa89cc9e8d5576fbde4325
Merge git://git./linux/kernel/git/bart/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  drivers/ide/{cs5530.c,sc1200.c}: Move a dereference below a NULL test