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