Merge git://git.infradead.org/hdrinstall-2.6