From: Linus Torvalds Date: Mon, 22 Dec 2008 22:40:48 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 X-Git-Tag: v2.6.28~12 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0099f77e0a224cc461d0d2930ef0fdb32c61ba64;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/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 --- 0099f77e0a224cc461d0d2930ef0fdb32c61ba64