Hi fattire,
Yesterday night (or this morning, 2 am, its depend :D) I ve merged the new kernel, but there was a lot of conflicted files.
I ve tried to compare some files, and it seems that only the page layout differs, but not compared all.
i will report back maybe tonight, if i have time...