Merge remote-tracking branch 'origin/aosp' into SK4.3

Conflicts:
	Makefile
	arch/arm/configs/KT_jf_defconfig
	arch/arm/mach-msm/board-8064-display.c
	arch/arm/mach-msm/board-8064-storage.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/cpufreq.c
	arch/arm/mm/init.c
	arch/ia64/mm/contig.c
	arch/ia64/mm/discontig.c
	arch/parisc/kernel/traps.c
	arch/parisc/mm/init.c
	arch/powerpc/kernel/iommu.c
	arch/powerpc/kernel/vio.c
	arch/powerpc/kvm/book3s_hv_rmhandlers.S
	arch/powerpc/lib/checksum_64.S
	arch/sparc/kernel/entry.S
	arch/sparc/kernel/ktlb.S
	arch/sparc/kernel/syscalls.S
	arch/sparc/kernel/trampoline_64.S
	arch/sparc/lib/ksyms.c
	arch/tile/include/asm/percpu.h
	arch/unicore32/mm/init.c
	block/Makefile
	block/bfq-cgroup.c
	block/bfq-iosched.c
	block/bfq.h
	build_master.sh
	drivers/Makefile
	drivers/acpi/acpi_ipmi.c
	drivers/block/cciss.c
	drivers/block/cpqarray.c
	drivers/char/msm_rotator.c
	drivers/char/random.c
	drivers/cpufreq/cpufreq.c
	drivers/cpufreq/cpufreq_ktoonservativeq.c
	drivers/dma/imx-dma.c
	drivers/gpu/drm/radeon/evergreen.c
	drivers/gpu/msm/Kconfig
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c
	drivers/infiniband/ulp/srpt/ib_srpt.c
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/mmc_ops.c
	drivers/mmc/core/sd.c
	drivers/net/bonding/bond_main.c
	drivers/net/ethernet/freescale/gianfar.c
	drivers/net/ethernet/freescale/gianfar.h
	drivers/net/ethernet/via/via-rhine.c
	drivers/net/ethernet/xilinx/ll_temac_main.c
	drivers/net/ppp/pptp.c
	drivers/net/usb/dm9601.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/wireless/rtlwifi/wifi.h
	drivers/scsi/esp_scsi.c
	drivers/scsi/esp_scsi.h
	drivers/slimbus/slimbus.c
	drivers/staging/comedi/drivers/ni_65xx.c
	drivers/staging/zram/zram_drv.c
	drivers/usb/host/xhci.h
	drivers/usb/serial/option.c
	drivers/video/msm/external_common.c
	drivers/video/msm/external_common.h
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/hdmi_msm.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/msm_dss_io_8960.c
	drivers/watchdog/ts72xx_wdt.c
	fs/btrfs/relocation.c
	fs/ext4/namei.c
	fs/ext4/xattr.c
	fs/statfs.c
	include/linux/mm.h
	include/linux/mmc/card.h
	include/linux/mmc/core.h
	include/linux/msm_mdp.h
	include/linux/random.h
	include/net/ip.h
	include/net/ipip.h
	init/main.c
	kernel/workqueue.c
	lib/show_mem.c
	mm/mmap.c
	mm/page_alloc.c
	net/bridge/br_private.h
	net/bridge/br_stp.c
	net/bridge/br_stp_if.c
	net/caif/cfctrl.c
	net/core/flow_dissector.c
	net/core/netpoll.c
	net/ipv4/igmp.c
	net/ipv4/inetpeer.c
	net/ipv4/ip_output.c
	net/ipv4/ipmr.c
	net/ipv4/raw.c
	net/ipv4/xfrm4_mode_tunnel.c
	net/ipv6/ip6_output.c
	net/ipv6/mcast.c
	net/netfilter/ipvs/ip_vs_xmit.c
	net/sctp/ipv6.c
	net/sctp/socket.c
	sound/pci/hda/patch_realtek.c
	sound/soc/codecs/88pm860x-codec.c
	sound/soc/codecs/max98095.c
	sound/usb/usx2y/usbusx2yaudio.c
	sound/usb/usx2y/usx2yhwdeppcm.c
Remove backup file
Update slimmed defconfig
Update and consolidate build script
Consolidate build scripts into one
jflteatt: conform to the rest of jf devices

* fixes build issues with our consolidated defconfig
jf: clean up and consolidate defconfigs
Merge branch 'SK4.3' of https://github.com/jsnmarek/kernel_samsung_jf into aosp4.3

Conflicts:
	build.sh