Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git] / drivers / scsi / sd.h
Simple merge