Merge tag 'cleanup_for_v3.9_round3' of git://git.infradead.org/users/jcooper/linux...