Just a bit of cleanup from me (resubmitted). The important patch comes from Julia. Julia's patch conflicts with the following: 1363594270-22137-1-git-send-email-airlied@gmail.com
Yeah I was going to leave the cleanups until -next opens, I'll push the fix though and get it to stable.
Dave.