merge StefanescuCristian changes to keep compiling -ck patches in Linux 3.9