Re: And your point is?
They started work to re-merge it last year. I believe that 3.5 or 3.6 brings both kernels in sync, at least mostly. If not a complete merge, I know it's planned to be using the mainline kernel at some point in the not so distant future.