Merge branch 'linux-3.0.y' of 'linux' into cm-11.0

Conflicts:
	arch/arm/mm/cache-l2x0.c
	crypto/algapi.c
	drivers/gpu/drm/i915/i915_debugfs.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/video/fbmem.c
	include/linux/nls.h
	kernel/cgroup.c
	kernel/signal.c
Boeffla sound
Touchwake