Merge branch 'android-3.0' into cm-10.1-rebase-y

Conflicts resolved using Motorola JB release kernel
usb/gadget drivers updated from motorola
Conflicts:
	Documentation/cpu-freq/governors.txt
	arch/arm/vfp/vfpmodule.c
	drivers/base/Kconfig
	drivers/base/Makefile
	drivers/base/sync.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/misc/pmem.c
	drivers/mmc/core/bus.c
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/bcmsdh.c
	drivers/net/wireless/bcmdhd/bcmsdh_linux.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c
	drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_cdc.c
	drivers/net/wireless/bcmdhd/dhd_cfg80211.c
	drivers/net/wireless/bcmdhd/dhd_cfg80211.h
	drivers/net/wireless/bcmdhd/dhd_common.c
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/include/bcmdevs.h
	drivers/net/wireless/bcmdhd/include/bcmsdstd.h
	drivers/net/wireless/bcmdhd/include/dhdioctl.h
	drivers/net/wireless/bcmdhd/include/epivers.h
	drivers/net/wireless/bcmdhd/include/hndpmu.h
	drivers/net/wireless/bcmdhd/include/sbchipc.h
	drivers/net/wireless/bcmdhd/include/sdioh.h
	drivers/net/wireless/bcmdhd/include/siutils.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.h
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.h
	drivers/net/wireless/bcmdhd/wl_iw.c
	drivers/staging/android/binder.c
	drivers/staging/android/logger.c
	drivers/usb/gadget/android.c
	include/linux/android_pmem.h
	include/linux/nl80211.h
	include/linux/sync.h
	include/trace/events/cpufreq_interactive.h
	kernel/cgroup.c
	net/netfilter/xt_IDLETIMER.c
	net/wireless/nl80211.c
Revert "misc: remove android pmem driver, it's obsolete."

This reverts commit d1e94136fc4fe8ea608f4e9d21befa00c86e1e29.

Conflicts:
	drivers/misc/pmem.c
	include/linux/android_pmem.h
Regenerate defconfig
fs/nfs/nfs4proc.c: Fix compile error with GCC4.6

fs/nfs/nfs4proc.c: In function '__nfs4_get_acl_uncached':
fs/nfs/nfs4proc.c:3594:2: warning: format '%ld' expects argument of
type 'long int', but argument 4 has type 'size_t' [-Wformat]
error, forbidden warning: nfs4proc.c:3594