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)
* 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


Trivial merge