Merge tag 'tags/disintegrate-tile-20121009' into for-linus