Merge upstream kernel changes

Most interesting are probably the HDMI driver changes, but additional filesystem and touchscreen support would also be nice.