Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into devel-stable