Linux 3.4.2

Conflicts:

	drivers/gpu/drm/radeon/ni.c
	include/drm/drm_pciids.h
	mm/vmalloc.c