Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can