Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd