Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel
[pandora-kernel.git] / drivers / scsi / jazz_esp.c
Simple merge