Merge branch 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/linux into...