Merge tag 'orion_cleanup_for_3.8' of git://git.infradead.org/users/jcooper/linux...