Upstream cherry pick for Intrepid: http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-intrepid.git;a=commitdiff;h=e31df13d7e4e6d78137b1bced0791134bba47d40
Upstream cherry pick for Intrepid: http:// kernel. ubuntu. com/git? p=ubuntu/ ubuntu- intrepid. git;a=commitdif f;h=e31df13d7e4 e6d78137b1bced0 791134bba47d40