Merge tag 'fixes-3.10-3' of git://git.infradead.org/users/jcooper/linux into fixes