Merge branch 'osync_cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/jack...