Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline