update to upstream common android-3.0 branch

Signed-off-by: zwliew <zhaoweiliew@gmail.com>

Conflicts:
	Documentation/cpu-freq/governors.txt
	arch/arm/Kconfig
	arch/arm/kernel/smp.c
	block/genhd.c
	drivers/base/Kconfig
	drivers/base/dma-buf.c
	drivers/base/sw_sync.c
	drivers/base/sync.c
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	drivers/cpufreq/cpufreq_interactive.c
	drivers/gpu/Makefile
	drivers/gpu/drm/i915/i915_debugfs.c
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/ion/Kconfig
	drivers/gpu/ion/Makefile
	drivers/gpu/ion/ion.c
	drivers/gpu/ion/ion_carveout_heap.c
	drivers/gpu/ion/ion_heap.c
	drivers/gpu/ion/ion_priv.h
	drivers/gpu/ion/ion_system_heap.c
	drivers/input/Kconfig
	drivers/input/Makefile
	drivers/leds/Kconfig
	drivers/leds/Makefile
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/uid_stat.c
	drivers/mmc/card/block.c
	drivers/mmc/core/Kconfig
	drivers/mmc/core/core.c
	drivers/mmc/core/sd.c
	drivers/mmc/core/sdio.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/bcmdhd/Kconfig
	drivers/net/wireless/bcmdhd/Makefile
	drivers/net/wireless/bcmdhd/aiutils.c
	drivers/net/wireless/bcmdhd/bcmevent.c
	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/bcmutils.c
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_bta.c
	drivers/net/wireless/bcmdhd/dhd_bta.h
	drivers/net/wireless/bcmdhd/dhd_bus.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_custom_gpio.c
	drivers/net/wireless/bcmdhd/dhd_dbg.h
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/dhd_linux_sched.c
	drivers/net/wireless/bcmdhd/dhd_proto.h
	drivers/net/wireless/bcmdhd/dhd_sdio.c
	drivers/net/wireless/bcmdhd/dhd_wlfc.h
	drivers/net/wireless/bcmdhd/dngl_stats.h
	drivers/net/wireless/bcmdhd/dngl_wlhdr.h
	drivers/net/wireless/bcmdhd/hndpmu.c
	drivers/net/wireless/bcmdhd/include/Makefile
	drivers/net/wireless/bcmdhd/include/aidmp.h
	drivers/net/wireless/bcmdhd/include/bcmcdc.h
	drivers/net/wireless/bcmdhd/include/bcmdefs.h
	drivers/net/wireless/bcmdhd/include/bcmdevs.h
	drivers/net/wireless/bcmdhd/include/bcmendian.h
	drivers/net/wireless/bcmdhd/include/bcmpcispi.h
	drivers/net/wireless/bcmdhd/include/bcmperf.h
	drivers/net/wireless/bcmdhd/include/bcmsdbus.h
	drivers/net/wireless/bcmdhd/include/bcmsdh.h
	drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h
	drivers/net/wireless/bcmdhd/include/bcmsdpcm.h
	drivers/net/wireless/bcmdhd/include/bcmsdspi.h
	drivers/net/wireless/bcmdhd/include/bcmsdstd.h
	drivers/net/wireless/bcmdhd/include/bcmspi.h
	drivers/net/wireless/bcmdhd/include/bcmutils.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/hndrte_armtrap.h
	drivers/net/wireless/bcmdhd/include/hndrte_cons.h
	drivers/net/wireless/bcmdhd/include/hndsoc.h
	drivers/net/wireless/bcmdhd/include/linux_osl.h
	drivers/net/wireless/bcmdhd/include/linuxver.h
	drivers/net/wireless/bcmdhd/include/miniopt.h
	drivers/net/wireless/bcmdhd/include/msgtrace.h
	drivers/net/wireless/bcmdhd/include/osl.h
	drivers/net/wireless/bcmdhd/include/packed_section_end.h
	drivers/net/wireless/bcmdhd/include/packed_section_start.h
	drivers/net/wireless/bcmdhd/include/pcicfg.h
	drivers/net/wireless/bcmdhd/include/proto/802.11.h
	drivers/net/wireless/bcmdhd/include/proto/802.11_bta.h
	drivers/net/wireless/bcmdhd/include/proto/802.11e.h
	drivers/net/wireless/bcmdhd/include/proto/802.1d.h
	drivers/net/wireless/bcmdhd/include/proto/bcmeth.h
	drivers/net/wireless/bcmdhd/include/proto/bcmevent.h
	drivers/net/wireless/bcmdhd/include/proto/bcmip.h
	drivers/net/wireless/bcmdhd/include/proto/bt_amp_hci.h
	drivers/net/wireless/bcmdhd/include/proto/eapol.h
	drivers/net/wireless/bcmdhd/include/proto/ethernet.h
	drivers/net/wireless/bcmdhd/include/proto/p2p.h
	drivers/net/wireless/bcmdhd/include/proto/sdspi.h
	drivers/net/wireless/bcmdhd/include/proto/vlan.h
	drivers/net/wireless/bcmdhd/include/proto/wpa.h
	drivers/net/wireless/bcmdhd/include/sbchipc.h
	drivers/net/wireless/bcmdhd/include/sbconfig.h
	drivers/net/wireless/bcmdhd/include/sbhnddma.h
	drivers/net/wireless/bcmdhd/include/sbpcmcia.h
	drivers/net/wireless/bcmdhd/include/sbsdio.h
	drivers/net/wireless/bcmdhd/include/sbsdpcmdev.h
	drivers/net/wireless/bcmdhd/include/sbsocram.h
	drivers/net/wireless/bcmdhd/include/sdio.h
	drivers/net/wireless/bcmdhd/include/sdioh.h
	drivers/net/wireless/bcmdhd/include/sdiovar.h
	drivers/net/wireless/bcmdhd/include/siutils.h
	drivers/net/wireless/bcmdhd/include/trxhdr.h
	drivers/net/wireless/bcmdhd/include/typedefs.h
	drivers/net/wireless/bcmdhd/include/wlfc_proto.h
	drivers/net/wireless/bcmdhd/include/wlioctl.h
	drivers/net/wireless/bcmdhd/linux_osl.c
	drivers/net/wireless/bcmdhd/sbutils.c
	drivers/net/wireless/bcmdhd/siutils.c
	drivers/net/wireless/bcmdhd/siutils_priv.h
	drivers/net/wireless/bcmdhd/uamp_api.h
	drivers/net/wireless/bcmdhd/wl_android.c
	drivers/net/wireless/bcmdhd/wl_android.h
	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_dbg.h
	drivers/net/wireless/bcmdhd/wl_iw.c
	drivers/net/wireless/bcmdhd/wl_iw.h
	drivers/net/wireless/bcmdhd/wl_linux_mon.c
	drivers/net/wireless/bcmdhd/wldev_common.c
	drivers/net/wireless/bcmdhd/wldev_common.h
	drivers/rtc/Kconfig
	drivers/rtc/alarm-dev.c
	drivers/rtc/alarm.c
	drivers/staging/android/binder.c
	drivers/staging/android/logger.c
	drivers/staging/android/logger.h
	drivers/staging/android/lowmemorykiller.c
	drivers/staging/android/ram_console.c
	drivers/switch/switch_class.c
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/android.c
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/f_accessory.c
	drivers/usb/gadget/f_adb.c
	drivers/usb/gadget/f_audio_source.c
	drivers/usb/gadget/f_mtp.c
	drivers/usb/gadget/f_rndis.c
	drivers/usb/gadget/storage_common.c
	drivers/usb/host/ehci.h
	fs/fuse/dev.c
	include/linux/android_alarm.h
	include/linux/cpufreq.h
	include/linux/dma-buf.h
	include/linux/earlysuspend.h
	include/linux/ion.h
	include/linux/mmc/host.h
	include/linux/mmc/pm.h
	include/linux/msdos_fs.h
	include/linux/nl80211.h
	include/linux/nls.h
	include/linux/sync.h
	include/linux/wakelock.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/mgmt.h
	include/net/bluetooth/smp.h
	include/net/cfg80211.h
	include/trace/events/cpufreq_interactive.h
	kernel/cgroup.c
	kernel/power/Kconfig
	kernel/power/earlysuspend.c
	kernel/power/main.c
	kernel/power/power.h
	kernel/power/wakelock.c
	mm/ashmem.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c
	net/ipv4/tcp.c
	net/netfilter/xt_IDLETIMER.c
	net/netfilter/xt_qtaguid.c
	net/netfilter/xt_qtaguid_internal.h
	net/netfilter/xt_qtaguid_print.c
	net/wireless/mlme.c
	net/wireless/nl80211.c
	net/wireless/nl80211.h
	security/commoncap.c

Change-Id: I58125935c2300bfb9f67add2f3ad2888d814d71b

Conflicts:
	drivers/base/sync.c
	drivers/gpu/Makefile
	kernel/signal.c