bd5735a45cfc1eaeadf6a0b455f9613c18c7cafd - CarbonROM/android_kernel_htc_flounder

commit	bd5735a45cfc1eaeadf6a0b455f9613c18c7cafd	[log] [tgz]
author	d34d <clark@cyngn.com>	Mon Oct 19 16:43:36 2015 -0700
committer	d34d <clark@cyngn.com>	Mon Oct 19 16:45:23 2015 -0700
tree	b8f8a7031582954ead6b4135c330fef53270941b
parent	ce34caabeaf7c50012d1cb4f38f51b7b31e237cd [diff]

Merge remote-tracking branch 'aosp/android-tegra-flounder-3.10-marshmallow' into HEAD

Change-Id: I6b07b8eea887ace75c385d6982d63202daaf1330

Documentation/ABI/testing/sysfs-kernel-wakeup_reasons[Added - diff]
Documentation/device-mapper/verity.txt[diff]
Documentation/devicetree/bindings/mmc/mmc.txt[diff]
Documentation/filesystems/proc.txt[diff]
Documentation/filesystems/squashfs.txt[diff]
Documentation/networking/ip-sysctl.txt[diff]
android/configs/android-base.cfg[diff]
arch/alpha/kernel/osf_sys.c[diff]
arch/arm/Kconfig[diff]
arch/arm/crypto/.gitignore[Added - diff]
arch/arm/crypto/Makefile[diff]
arch/arm/crypto/aes_glue.c[diff]
arch/arm/crypto/aes_glue.h[Added - diff]
arch/arm/crypto/aesbs-core.S_shipped[Added - diff]
arch/arm/crypto/aesbs-glue.c[Added - diff]
arch/arm/crypto/bsaes-armv7.pl[Added - diff]
arch/arm/crypto/sha1-armv7-neon.S[Added - diff]
arch/arm/crypto/sha1_glue.c[diff]
arch/arm/crypto/sha1_neon_glue.c[Added - diff]
arch/arm/crypto/sha256-armv4.pl[Added - diff]
arch/arm/crypto/sha256-core.S_shipped[Added - diff]
arch/arm/crypto/sha256_glue.c[Added - diff]
arch/arm/crypto/sha256_glue.h[Added - diff]
arch/arm/crypto/sha256_neon_glue.c[Added - diff]
arch/arm/crypto/sha512-armv7-neon.S[Added - diff]
arch/arm/crypto/sha512_neon_glue.c[Added - diff]
arch/arm/include/asm/Kbuild[diff]
arch/arm/include/asm/crypto/sha1.h[Added - diff]
arch/arm/include/asm/neon.h[Added - diff]
arch/arm/include/asm/unistd.h[diff]
arch/arm/include/uapi/asm/unistd.h[diff]
arch/arm/kernel/calls.S[diff]
arch/arm/kernel/ptrace.c[diff]
arch/arm/mach-tegra/board-flounder-sdhci.c[diff]
arch/arm/mach-tegra/board-flounder.c[diff]
arch/arm/mach-tegra/common.c[diff]
arch/arm/vfp/vfpmodule.c[diff]
arch/arm64/Makefile[diff]
arch/arm64/boot/dts/tegra132-flounder-generic.dtsi[diff]
arch/arm64/boot/dts/tegra132.dtsi[diff]
arch/arm64/configs/defconfig[diff]
arch/arm64/configs/flounder_defconfig[diff]
arch/parisc/hpux/fs.c[diff]
arch/um/include/shared/frame_kern.h[diff]
arch/um/kernel/signal.c[diff]
arch/um/os-Linux/signal.c[diff]
arch/um/os-Linux/skas/process.c[diff]
arch/x86/configs/i386_defconfig[diff]
arch/x86/configs/i386_qemu_defconfig[Added - diff]
arch/x86/include/asm/processor.h[diff]
arch/x86/include/asm/relaxed.h[Added - diff]
arch/x86/syscalls/syscall_32.tbl[diff]
arch/x86/syscalls/syscall_64.tbl[diff]
arch/x86/um/signal.c[diff]
build.config[diff]
crypto/Kconfig[diff]
drivers/Kconfig[diff]
drivers/Makefile[diff]
drivers/android/Kconfig[Added - diff]
drivers/android/Makefile[Added - diff]
drivers/android/binder.c[Renamed from drivers/staging/android/binder.c - diff]
drivers/android/binder_trace.h[Renamed from drivers/staging/android/binder_trace.h - diff]
drivers/base/dma-coherent.c[diff]
drivers/base/dma-contiguous.c[diff]
drivers/base/power/main.c[diff]
drivers/base/power/wakeup.c[diff]
drivers/base/syscore.c[diff]
drivers/cpufreq/cpufreq_interactive.c[diff]
drivers/cpufreq/cpufreq_stats.c[diff]
drivers/dma/tegra20-apb-dma.c[diff]
drivers/gpu/nvgpu/gk20a/gr_gk20a.c[diff]
drivers/gpu/nvgpu/gk20a/pmu_gk20a.c[diff]
drivers/gpu/nvgpu/gk20a/pmu_gk20a.h[diff]
drivers/i2c/chips/CwMcuSensor.c[diff]
drivers/md/dm-verity.c[diff]
drivers/media/platform/tegra/nvavp/nvavp_dev.c[diff]
drivers/media/platform/tegra/ov9760.c[diff]
drivers/misc/Kconfig[diff]
drivers/misc/Makefile[diff]
drivers/misc/apanic.c[Deleted - diff]
drivers/misc/bluedroid_pm.c[diff]
drivers/misc/uid_cputime.c[Added - diff]
drivers/mmc/card/block.c[diff]
drivers/mmc/card/mmc_test.c[diff]
drivers/mmc/core/bus.c[diff]
drivers/mmc/core/core.c[diff]
drivers/mmc/core/core.h[diff]
drivers/mmc/core/host.c[diff]
drivers/mmc/core/mmc.c[diff]
drivers/mmc/core/sd.c[diff]
drivers/net/wireless/ath/ath6kl/cfg80211.c[diff]
drivers/net/wireless/bcmdhd/Kconfig[diff]
drivers/net/wireless/bcmdhd/Makefile[diff]
drivers/net/wireless/bcmdhd/bcmevent.c[diff]
drivers/net/wireless/bcmdhd/bcmsdh_linux.c[diff]
drivers/net/wireless/bcmdhd/bcmutils.c[diff]
drivers/net/wireless/bcmdhd/bcmxtlv.c[Added - diff]
drivers/net/wireless/bcmdhd/dhd.h[diff]
drivers/net/wireless/bcmdhd/dhd_bus.h[diff]
drivers/net/wireless/bcmdhd/dhd_cdc.c[diff]
drivers/net/wireless/bcmdhd/dhd_common.c[diff]
drivers/net/wireless/bcmdhd/dhd_custom_platdev.c[Added - diff]
drivers/net/wireless/bcmdhd/dhd_dbg.h[diff]
drivers/net/wireless/bcmdhd/dhd_debug.c[Added - diff]
drivers/net/wireless/bcmdhd/dhd_debug.h[Added - diff]
drivers/net/wireless/bcmdhd/dhd_debug_linux.c[Added - diff]
drivers/net/wireless/bcmdhd/dhd_flowring.c[diff]
drivers/net/wireless/bcmdhd/dhd_flowring.h[diff]
drivers/net/wireless/bcmdhd/dhd_linux.c[diff]
drivers/net/wireless/bcmdhd/dhd_linux.h[diff]
drivers/net/wireless/bcmdhd/dhd_linux_platdev.c[diff]
drivers/net/wireless/bcmdhd/dhd_linux_wq.h[diff]
drivers/net/wireless/bcmdhd/dhd_msgbuf.c[diff]
drivers/net/wireless/bcmdhd/dhd_pcie.c[diff]
drivers/net/wireless/bcmdhd/dhd_pcie.h[diff]
drivers/net/wireless/bcmdhd/dhd_pcie_linux.c[diff]
drivers/net/wireless/bcmdhd/dhd_pno.c[diff]
drivers/net/wireless/bcmdhd/dhd_pno.h[diff]
drivers/net/wireless/bcmdhd/dhd_rtt.c[diff]
drivers/net/wireless/bcmdhd/dhd_rtt.h[diff]
drivers/net/wireless/bcmdhd/dhd_sdio.c[diff]
drivers/net/wireless/bcmdhd/dhd_wlfc.c[diff]
drivers/net/wireless/bcmdhd/dngl_stats.h[diff]
drivers/net/wireless/bcmdhd/hnd_pktq.c[diff]
drivers/net/wireless/bcmdhd/include/bcmdevs.h[diff]
drivers/net/wireless/bcmdhd/include/bcmsdh.h[diff]
drivers/net/wireless/bcmdhd/include/bcmutils.h[diff]
drivers/net/wireless/bcmdhd/include/devctrl_if/wlioctl_defs.h[diff]
drivers/net/wireless/bcmdhd/include/dhdioctl.h[diff]
drivers/net/wireless/bcmdhd/include/event_log.h[diff]
drivers/net/wireless/bcmdhd/include/event_trace.h[Added - diff]
drivers/net/wireless/bcmdhd/include/proto/bcmeth.h[diff]
drivers/net/wireless/bcmdhd/include/proto/bcmevent.h[diff]
drivers/net/wireless/bcmdhd/include/proto/dnglevent.h[Added - diff]
drivers/net/wireless/bcmdhd/include/wlioctl.h[diff]
drivers/net/wireless/bcmdhd/linux_osl.c[diff]
drivers/net/wireless/bcmdhd/siutils.c[diff]
drivers/net/wireless/bcmdhd/wl_cfg80211.c[diff]
drivers/net/wireless/bcmdhd/wl_cfgp2p.c[diff]
drivers/net/wireless/bcmdhd/wl_cfgvendor.c[diff]
drivers/net/wireless/bcmdhd/wl_cfgvendor.h[diff]
drivers/staging/android/Kconfig[diff]
drivers/staging/android/Makefile[diff]
drivers/staging/android/alarm-dev.c[Deleted - diff]
drivers/staging/android/android_alarm.h[Deleted - diff]
drivers/staging/android/ashmem.c[diff]
drivers/staging/android/binder.h[Deleted - diff]
drivers/staging/android/fiq_debugger/fiq_debugger.c[diff]
drivers/staging/android/ion/ion.c[diff]
drivers/staging/android/ion/ion_heap.c[diff]
drivers/staging/android/ion/ion_priv.h[diff]
drivers/staging/android/ion/ion_system_heap.c[diff]
drivers/staging/android/logger.c[Deleted - diff]
drivers/staging/android/logger.h[Deleted - diff]
drivers/staging/android/lowmemorykiller.c[diff]
drivers/staging/android/sw_sync.c[diff]
drivers/staging/android/sync.c[diff]
drivers/staging/android/timed_gpio.c[diff]
drivers/staging/android/uapi/android_alarm.h[Deleted - diff]
drivers/staging/android/uapi/ashmem.h[diff]
drivers/usb/gadget/Kconfig[diff]
drivers/usb/gadget/android.c[diff]
drivers/usb/gadget/f_accessory.c[diff]
drivers/usb/gadget/f_audio_source.c[diff]
drivers/usb/gadget/f_midi.c[diff]
drivers/usb/phy/tegra-otg.c[diff]
drivers/video/adf/adf_fbdev.c[diff]
drivers/video/tegra/nvmap/nvmap_dev.c[diff]
drivers/video/tegra/tegra_adf.c[diff]
drivers/watchdog/tegra_wdt.c[diff]
fs/buffer.c[diff]
fs/compat.c[diff]
fs/direct-io.c[diff]
fs/ecryptfs/file.c[diff]
fs/exportfs/expfs.c[diff]
fs/ext4/Kconfig[diff]
fs/ext4/Makefile[diff]
fs/ext4/acl.c[diff]
fs/ext4/acl.h[diff]
fs/ext4/balloc.c[diff]
fs/ext4/bitmap.c[diff]
fs/ext4/block_validity.c[diff]
fs/ext4/crypto.c[Added - diff]
fs/ext4/crypto_fname.c[Added - diff]
fs/ext4/crypto_key.c[Added - diff]
fs/ext4/crypto_policy.c[Added - diff]
fs/ext4/dir.c[diff]
fs/ext4/ext4.h[diff]
fs/ext4/ext4_crypto.h[Added - diff]
fs/ext4/ext4_extents.h[diff]
fs/ext4/ext4_jbd2.c[diff]
fs/ext4/ext4_jbd2.h[diff]
fs/ext4/extents.c[diff]
fs/ext4/extents_status.c[diff]
fs/ext4/extents_status.h[diff]
fs/ext4/file.c[diff]
fs/ext4/fsync.c[diff]
fs/ext4/ialloc.c[diff]
fs/ext4/indirect.c[diff]
fs/ext4/inline.c[diff]
fs/ext4/inode.c[diff]
fs/ext4/ioctl.c[diff]
fs/ext4/mballoc.c[diff]
fs/ext4/mballoc.h[diff]
fs/ext4/migrate.c[diff]
fs/ext4/mmp.c[diff]
fs/ext4/move_extent.c[diff]
fs/ext4/namei.c[diff]
fs/ext4/page-io.c[diff]
fs/ext4/readpage.c[Added - diff]
fs/ext4/resize.c[diff]
fs/ext4/super.c[diff]
fs/ext4/symlink.c[diff]
fs/ext4/xattr.c[diff]
fs/ext4/xattr.h[diff]
fs/f2fs/data.c[diff]
fs/f2fs/node.c[diff]
fs/f2fs/super.c[diff]
fs/gfs2/export.c[diff]
fs/inode.c[diff]
fs/jbd2/Kconfig[diff]
fs/jbd2/checkpoint.c[diff]
fs/jbd2/commit.c[diff]
fs/jbd2/journal.c[diff]
fs/jbd2/recovery.c[diff]
fs/jbd2/revoke.c[diff]
fs/jbd2/transaction.c[diff]
fs/nfsd/nfs4recover.c[diff]
fs/nfsd/vfs.c[diff]
fs/ocfs2/aops.c[diff]
fs/proc/base.c[diff]
fs/proc/task_mmu.c[diff]
fs/pstore/Kconfig[diff]
fs/pstore/Makefile[diff]
fs/pstore/inode.c[diff]
fs/pstore/internal.h[diff]
fs/pstore/platform.c[diff]
fs/pstore/pmsg.c[Added - diff]
fs/pstore/ram.c[diff]
fs/readdir.c[diff]
fs/squashfs/Kconfig[diff]
fs/squashfs/Makefile[diff]
fs/squashfs/block.c[diff]
fs/squashfs/cache.c[diff]
fs/squashfs/decompressor.c[diff]
fs/squashfs/decompressor.h[diff]
fs/squashfs/decompressor_multi.c[Added - diff]
fs/squashfs/decompressor_multi_percpu.c[Added - diff]
fs/squashfs/decompressor_single.c[Added - diff]
fs/squashfs/dir.c[diff]
fs/squashfs/file.c[diff]
fs/squashfs/file_cache.c[Added - diff]
fs/squashfs/file_direct.c[Added - diff]
fs/squashfs/lz4_wrapper.c[Added - diff]
fs/squashfs/lzo_wrapper.c[diff]
fs/squashfs/namei.c[diff]
fs/squashfs/page_actor.c[Added - diff]
fs/squashfs/page_actor.h[Added - diff]
fs/squashfs/squashfs.h[diff]
fs/squashfs/squashfs_fs.h[diff]
fs/squashfs/squashfs_fs_sb.h[diff]
fs/squashfs/super.c[diff]
fs/squashfs/xz_wrapper.c[diff]
fs/squashfs/zlib_wrapper.c[diff]
fs/super.c[diff]
fs/udf/super.c[diff]
fs/xfs/xfs_aops.c[diff]
fs/xfs/xfs_aops.h[diff]
include/asm-generic/dma-coherent.h[diff]
include/asm-generic/percpu.h[diff]
include/linux/bitops.h[diff]
include/linux/buffer_head.h[diff]
include/linux/cgroup.h[diff]
include/linux/cpufreq.h[diff]
include/linux/dma-contiguous.h[diff]
include/linux/err.h[diff]
include/linux/fs.h[diff]
include/linux/initramfs.h[Added - diff]
include/linux/ipv6.h[diff]
include/linux/jbd2.h[diff]
include/linux/jbd_common.h[diff]
include/linux/key.h[diff]
include/linux/lsm_audit.h[diff]
include/linux/lz4.h[Added - diff]
include/linux/mm.h[diff]
include/linux/mmc/card.h[diff]
include/linux/mmc/host.h[diff]
include/linux/of.h[diff]
include/linux/page-flags.h[diff]
include/linux/pagemap.h[diff]
include/linux/pstore.h[diff]
include/linux/pstore_ram.h[diff]
include/linux/rbtree.h[diff]
include/linux/sched.h[diff]
include/linux/suspend.h[diff]
include/linux/syscalls.h[diff]
include/linux/tegra_nvavp.h[diff]
include/linux/wait.h[diff]
include/linux/wakeup_reason.h[diff]
include/linux/wlan_plat.h[diff]
include/net/cfg80211.h[diff]
include/net/flow.h[diff]
include/net/net_namespace.h[diff]
include/net/ping.h[diff]
include/trace/events/ext4.h[diff]
include/uapi/linux/Kbuild[diff]
include/uapi/linux/android/Kbuild[Added - diff]
include/uapi/linux/android/binder.h[Renamed from drivers/staging/android/uapi/binder.h - diff]
include/uapi/linux/falloc.h[diff]
include/uapi/linux/fiemap.h[diff]
include/uapi/linux/ipv6.h[diff]
init/Makefile[diff]
init/initramfs.c[diff]
init/noinitramfs.c[diff]
kernel/cgroup.c[diff]
kernel/fork.c[diff]
kernel/irq/pm.c[diff]
kernel/power/process.c[diff]
kernel/power/suspend.c[diff]
kernel/power/wakeup_reason.c[diff]
kernel/sched/core.c[diff]
kernel/sched/cputime.c[diff]
kernel/seccomp.c[diff]
kernel/sys.c[diff]
kernel/wait.c[diff]
lib/Kconfig[diff]
lib/Makefile[diff]
lib/lz4/Makefile[Added - diff]
lib/lz4/lz4_compress.c[Added - diff]
lib/lz4/lz4_decompress.c[Added - diff]
lib/lz4/lz4defs.h[Added - diff]
lib/lz4/lz4hc_compress.c[Added - diff]
lib/rbtree.c[diff]
mm/filemap.c[diff]
mm/memcontrol.c[diff]
mm/memory.c[diff]
mm/mlock.c[diff]
mm/mm_init.c[diff]
mm/page-writeback.c[diff]
mm/page_alloc.c[diff]
mm/truncate.c[diff]
mm/vmalloc.c[diff]
net/caif/caif_socket.c[diff]
net/core/neighbour.c[diff]
net/ipv4/fib_frontend.c[diff]
net/ipv4/fib_semantics.c[diff]
net/ipv4/ipmr.c[diff]
net/ipv4/netfilter/ipt_rpfilter.c[diff]
net/ipv4/ping.c[diff]
net/ipv6/addrconf.c[diff]
net/ipv6/ip6mr.c[diff]
net/ipv6/ping.c[diff]
net/ipv6/route.c[diff]
net/netfilter/xt_IDLETIMER.c[diff]
net/unix/af_unix.c[diff]
net/wireless/nl80211.c[diff]
scripts/Makefile.modinst[diff]
security/lsm_audit.c[diff]
security/selinux/avc.c[diff]
security/selinux/hooks.c[diff]
security/selinux/include/avc.h[diff]
security/selinux/include/netif.h[diff]
security/selinux/include/netnode.h[diff]
security/selinux/include/netport.h[diff]
security/selinux/include/objsec.h[diff]
security/selinux/include/security.h[diff]
security/selinux/netif.c[diff]
security/selinux/netnode.c[diff]
security/selinux/netport.c[diff]
security/selinux/nlmsgtab.c[diff]
security/selinux/ss/avtab.c[diff]
security/selinux/ss/avtab.h[diff]
security/selinux/ss/conditional.c[diff]
security/selinux/ss/conditional.h[diff]
security/selinux/ss/constraint.h[diff]
security/selinux/ss/policydb.c[diff]
security/selinux/ss/policydb.h[diff]
security/selinux/ss/services.c[diff]
security/selinux/ss/services.h[diff]
sound/soc/soc-dapm.c[diff]
sound/soc/tegra/tegra30_dam.c[diff]
sound/soc/tegra/tegra_offload.c[diff]
sound/soc/tegra/tegra_pcm.c[diff]

383 files changed

tree: b8f8a7031582954ead6b4135c330fef53270941b