Merge remote-tracking branch 'linux/linux-3.4.y' into HEAD

Conflicts:
	Makefile
	drivers/gpu/drm/drm_edid.c
	drivers/usb/core/message.c
	kernel/cgroup.c
	net/bluetooth/rfcomm/sock.c
	net/bluetooth/smp.c

Signed-off-by: Paul Beeler <sparksco@gmail.com>
update defconfig for linux-3.4.y merge
Signed-off-by: Paul Beeler <sparksco@gmail.com>