Fix merge error for Linux 3.0.50