Update kernel to 2.6.36.4
Merge branch '2011.11' into 2012.11