Merge tag 'uapi-20121219' into for-linus