Linux 3.0.61

Change-Id: I9b6527e26176e1e6f67929a7d60d5e8de021ee12
Merge CM branch 'upstream/jellybean' into jellybean