DRM-enabled config
kgsl_drm fix
Working config
kgsl: fix null ptr on cache flush

Conflicts:
	drivers/gpu/msm/kgsl_sharedmem.c
kgsl: drm: remove checking on 'active'

We are using this field as an evil way to synchronize between mesa and
ddx, and the error checking gets in the way.. so get rid of it.
get rid of bogus timestamp check

Conflicts:
	drivers/gpu/msm/adreno.c
various stupid compile errors

Conflicts:
	drivers/media/common/tuners/xc4000.c
	fs/cifs/transport.c
	net/netfilter/xt_socket.c
drm/kgsl: fix compile error

Conflicts:
	drivers/gpu/msm/kgsl_drm.c
msm/video: add true ARGB

(or named following the MDP convention, reading from LSB to MSB, BGRA)

Mesa EGL and X11 really seem to expect ARGB.  Which is a bit
unfortunate, as android seems to expect ABGR.  At least for now you can
change the default and build a kernel that will make the linux userspace
happy.
Revert "msm: display: use the fb reserved fields same as kernel 3.0"

This reverts commit ec5b2ff6857134832d165b8c2db8174c0d0ef4a7.

Conflicts:
	drivers/video/msm/external_common.c
	drivers/video/msm/msm_fb.c
backport drm from 3.10-rc7

Sync to commit:

commit 9e895ace5d82df8929b16f58e9f515f6d54ab82d
Author:     Linus Torvalds <torvalds@linux-foundation.org>
AuthorDate: Sat Jun 22 09:47:31 2013 -1000
Commit:     Linus Torvalds <torvalds@linux-foundation.org>
CommitDate: Sat Jun 22 09:47:31 2013 -1000

    Linux 3.10-rc7

Signed-off-by: Rob Clark <robdclark@gmail.com>

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/radeon/radeon_mode.h
	drivers/gpu/msm/kgsl_drm.c