Linux 3.0.60

Change-Id: I9d3e94a3830cb37a0b0f457a5d3c0eade9400a75
Signed-off-by: rohan <rohanmathur34@gmail.com>
Merge CM branch 'upstream/jellybean' into jellybean