^/vendor/clang/dist, resolve conflicts, and cleanup patches.
preserve our customizations, where necessary.
upcoming 3.3 release (branching and freezing expected in a few weeks). Preliminary release notes can be found at the usual location: <http://llvm.org/docs/ReleaseNotes.html> An MFC is planned once the actual 3.3 release is finished.
