Merge with my HammerMod Kernel