Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into sa1100