Updating the code for the v3.8.13 kernel
Merging...