Merge tag 'uapi-prep-20121002' of git://git.infradead.org/users/dhowells/linux-headers