fs/fat/dir.c:43: warning: 'de' may be used uninitialized in this function

The complexity of the code flow makes this seem possible.  Initialize
the value to NULL to eliminate the compiler warning.  This only masks
the warning, since if the value were unused, there would still be a
NULL pointer.

Change-Id: I9fc36abace09409853b63e0997328b75ce703769
Signed-off-by: David Brown <davidb@codeaurora.org>
security: fixed to build with ANDROID_PARANOID_NETWORK disabled
Revert "remove missing reference"

This reverts commit 9ef065db2636d6e08e7a88b67fb34b3b66df2129.
Revert "Revert "[moto] add config PM_FOOTPRINT""

This reverts commit fb3ab80682b198b542a0b2748ad2449435109a29.
defconfig update: re-add PM_FOOTPRINT to fix lis3dh accel sensor (rotation)

Change-Id: Iceb90ec28c9e3387960b3b797486773e0244bbfe
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_motorola_omap4-common into HEAD
Modified akm8975 driver to support solana

Conflicts:
	include/linux/akm8975.h

Change-Id: If676020fa72eed64d31a6df80a16e6f0db75bb76
Turn off temp debug messages in modified akm8975 driver
akm8975: add ifdef for SOLANA, was breaking others

Change-Id: I82c71338dc22fdbeec23873df3aad7b02bbf7c49
solana support config

Change-Id: I4194e4937b3d5c6fa1396cf3d37d2ad25d3ef957
omap_dce: add driver + board config/ion/remoteproc changes

Change-Id: I482cc9e96e91f386da2f9eccb28dc0798d3540ea
deconfig: update for solana/omap_dce changes

Change-Id: Iea2cb126126bb864f97be93f0424be7e48851fc0
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_motorola_omap4-common into cm-10.1
omap_dce: fix CONFIG_VIDEO_OMAP_DCE defines

Change-Id: Idadff1a2b49c7771b7530b6901e0a937566c6d62
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_motorola_omap4-common into cm-10.1
Add ability to use variant defconfig for device differences

and use shared defconfig

Change-Id: Ie49e84a54e9758a661edfde6076ec0fc0929c047
defconfig: Update per http://source.android.com/devices/tech/kernel.html

Change-Id: I4ea1a4056f5c7824e2d0c41c5cf2834480edd7ad
perf: Treat attr.config as u64 in perf_swevent_init()

commit 8176cced706b5e5d15887584150764894e94e02f upstream.

Trinity discovered that we fail to check all 64 bits of
attr.config passed by user space, resulting to out-of-bounds
access of the perf_swevent_enabled array in
sw_perf_event_destroy().

Introduced in commit b0a873ebb ("perf: Register PMU
implementations").

Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: davej@redhat.com
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Link: http://lkml.kernel.org/r/1365882554-30259-1-git-send-email-tt.rantala@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Change-Id: Ie966108d220da41db0ee294fdea395c8a941565b
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_motorola_omap4-common into cm-10.1
Merge branch 'cm-10.1' into edison