Kernel 3.0 sync with NaA