Merge remote-tracking branch 'remotes/origin/tmp-ef00624f' into msm-4.8_Linaro--llctMerge_2

* remotes/origin/tmp-ef00624f:
  ANDROID: configs: merge non-upstream AOSP config fragments
  ANDROID: sdcardfs: get rid of 'parent' argument of ->d_compare()
  ANDROID: sdcardfs: add parent pointer into dentry name hash
  ANDROID: ext4: fix FIDTRIM support
  ANDROID: dm verity fec: include dm-core.h instead of dm.h
  ANDROID: sdcardfs: eliminate the offset argument to ->direct_IO
  ANDROID: sdcardfs: use wrappers to access i_mutex
  ANDROID: usb: gadget: u_ether: fix dev->trans_start removal fallout
  ANDROID: proc: fix depreciated call to get_user_pages in task_mmu
  ANDROID: usb: gadget: fix MTP OS desc support
  usb: gadget: f_accessory: remove duplicate endpoint alloc
  FROMLIST: proc: Add LSM hook checks to /proc/<tid>/timerslack_ns
  FROMLIST: proc: Relax /proc/<tid>/timerslack_ns capability requirements
  cpuset: Add allow_attach hook for cpusets on android.
  ANDROID: sdcardfs: fix itnull.cocci warnings
  android-recommended.cfg: enable fstack-protector-strong
  sdcardfs: Truncate packages_gid.list on overflow
  netfilter: xt_quota2: make quota2_log work well
  ANDROID: base-cfg: enable UID_CPUTIME
  ANDROID: configs: remove unused configs
  ANDROID: cpu: send KOBJ_ONLINE event when enabling cpus
  ANDROID: dm verity fec: initialize recursion level
  ANDROID: dm verity fec: add missing release from fec_ktype
  ANDROID: dm verity fec: limit error correction recursion
  ANDROID: restrict access to perf events
  FROMLIST: security,perf: Allow further restriction of perf_event_open
  ARM64: Ignore Image-dtb from git point of view
  arm64: add option to build Image-dtb
  ANDROID: usb: gadget: f_midi: set fi->f to NULL when free f_midi function
  cpufreq: interactive: drop cpufreq_{get,put}_global_kobject func calls
  xt_qtaguid: Fix panic caused by processing non-full socket.
  fiq_debugger: Add fiq_debugger.disable option
  FROMLIST: wlcore: Disable filtering in AP role
  fiq_debugger: Add option to apply uart overlay by FIQ_DEBUGGER_UART_OVERLAY
  usb: dual-role: make stub functions inline
  quick selinux support for tracefs
  xt_qtaguid: Fix panic caused by synack processing
  fuse: Add support for d_canonical_path
  vfs: change d_canonical_path to take two paths
  netfilter: xt_qtaguid: seq_printf fixes
  ANDROID: base-cfg: enable CONFIG_IP_NF_NAT
  android: base-cfg: enable CONFIG_QUOTA
  ANDROID: mmc: Add CONFIG_MMC_SIMULATE_MAX_SPEED
  android: base-cfg: Add CONFIG_INET_DIAG_DESTROY
  cpufreq: interactive: only apply interactive boost when enabled
  cpufreq: interactive: fix policy locking
  ANDROID: dm verity fec: add sysfs attribute fec/corrected
  ANDROID: android: base-cfg: enable CONFIG_DM_VERITY_FEC
  mm: Export do_munmap
  sdcardfs: remove unneeded __init and __exit
  sdcardfs: Remove unused code
  fs: Export d_absolute_path
  sdcardfs: remove effectless config option
  inotify: Fix erroneous update of bit count
  fs: sdcardfs: Declare LOOKUP_CASE_INSENSITIVE unconditionally
  trace: cpufreq: fix typo in min/max cpufreq
  sdcardfs: Add support for d_canonical_path
  vfs: add d_canonical_path for stacked filesystem support
  sdcardfs: Bring up to date with Android M permissions:
  Changed type-casting in packagelist management
  Port of sdcardfs to 4.4
  Included sdcardfs source code for kernel 3.0
  ANDROID: usb: gadget: Add support for MTP OS desc
  CHROMIUM: usb: gadget: f_accessory: add .raw_request callback
  CHROMIUM: usb: gadget: audio_source: add .free_func callback
  CHROMIUM: usb: gadget: f_mtp: fix usb_ss_ep_comp_descriptor
  CHROMIUM: usb: gadget: f_mtp: Add SuperSpeed support
  usb: u_ether: Add missing rx_work init
  ANDROID: dm-crypt: run in a WQ_HIGHPRI workqueue
  power: Provide dummy log_suspend_abort_reason() if SUSPEND is disabled
  PM / suspend: Add dependency on RTC_LIB
  video: adf: Set ADF_MEMBLOCK to boolean
  video: adf: Fix modular build
  net: ppp: Fix modular build for PPPOLAC and PPPOPNS
  net: pppolac/pppopns: Replace msg.msg_iov with iov_iter_kvec()
  ANDROID: mmc: sdio: Disable retuning in sdio_reset_comm()
  ANDROID: kernel/watchdog: fix unused variable warning
  ANDROID: usb: gadget: f_mtp: don't use le16 for u8 field
  ANDROID: lowmemorykiller: fix declaration order warnings
  ANDROID: net: fix 'const' warnings
  ANDROID: mmc: move to a SCHED_FIFO thread
  android: base-cfg: Add CONFIG_IP_MULTICAST
  android: recommended.cfg: enable taskstats
  ion: fix page pool cache policy
  xt_qtaguid: fix a race condition in if_tag_stat_update
  android: skip building drivers as modules
  usb: gadget: u_ether: use %z format specifier for size_t
  userfaultfd: Add missing vma_merge parameter
  goldfish: pipe: fix platform_no_drv_owner.cocci warnings
  uid_cputime: skip power reporting per uid for now
  cgroup: refactor allow_attach handler for 4.4
  usb: gadget: rndis: fix broken build for 4.4
  usb: gadget: rndis: fix broken data aggregation build
  mm: private anonymous memory build fixes for 4.4
  netfilter: xt_qtaguid/socket: build fixes for 4.4
  net: PPPoPNS and PPPoLAC build fixes for 4.4
  usb: gadget: rndis: use %z format specifier for size_t
  kbuild: Makefile.clean: make Kbuild and Makefile optional
  ANDROID: rtc-palmas: correct for bcd year
  sched: add sched blocked tracepoint which dumps out context of sleep.
  ANDROID: android: base-cfg: disable CONFIG_SYSVIPC
  CHROMIUM: android: fix warning when releasing active sync point
  net: ipv6: fix virtual tunneling build
  Hack: net: PPPoPNS and PPPoLAC build fixes for 4.1
  net: pppopns: pppolac: fix sendmsg function calls
  fiq_debugger: Build fixes for 4.1
  trace: cpufreq: Add tracing for min/max cpufreq
  of: Fix build warnings
  android: configs: base: enable configfs gadget functions
  android: add CONFIG_DEBUG_RODATA to recommended config
  android: configs: remove CONFIG_BATTERY_ANDROID=y
  android: configs: base: enable IPV6
  android: configs: Enable SELinux and its dependencies.
  android: base-cfg: disable ALARM_DEV
  android: base-cfg: turn off /dev/mem and /dev/kmem
  android: base-cfg: enable ARMV8_DEPRECATED and subfeatures
  android: base-cfg: enforce the needed XFRM_MODE_TUNNEL (for VPN)
  android: base-cfg: disable LOGGER
  android: base-cfg: enable DM_VERITY (used for secureboot)
  android: configs: add systrace support to recommended configs
  android: configs: update 3.10 options
  android: configs: Add CONFIG_NETFILTER_XT_TARGET_IDLETIMER
  android: configs: add IPV6 ROUTE INFO
  android: configs: add TIMER_STATS back, helps with sysrq t.
  android: configs: Add HIDRAW to recommended set
  android: configs: require TCPMSS, remove SCHED_TRACER and TIMER_STATS
  android: configs: Reorder config fragments, update README
  android: configs: no MODULES for base, no SIP for recommended
  android: configs: Reorder config fragments
  android: configs: Enable KSM support by default
  android: configs: Add Logitech unifying receivers to recommended
  android: configs: Initial commit of Android config fragments
  wakeup: Add the guard condition for len in pm_get_active_wakeup_sources
  epoll: use freezable blocking call
  Fix for in kernel emergency remount when loop mounts are used
  kbuild: make it possible to specify the module output dir
  ext4: Add support for FIDTRIM, a best-effort ioctl for deep discard trim
  hardlockup: detect hard lockups without NMIs using secondary cpus
  sync: add Documentation/sync.txt
  w1: ds2482: Manage SLPZ pin sleep state
  fuse: Freeze client on suspend when request sent to userspace
  serial_core: Add wake_peer uart operation
  Revert "ARM: Blacklist GCC 4.8.0 to GCC 4.8.2 - PR58854"
  mm: add a field to store names for private anonymous memory
  pstore/ram: Add ramoops_console_write_buf api
  pstore: Update Documentation/android.txt
  arm64: pass return address to dma_common_contiguous_remap
  arm64 Kconfig: Move LIST_POISON to a safe value
  arch: arm64: force -fno-pic
  arm64: process: dump memory around registers when displaying regs
  arm64: check for upper PAGE_SHIFT bits in pfn_valid()
  ARM: fault: assume no context when IRQs are disabled during data abort.
  initramfs: Add skip_initramfs command line option
  of: fix CONFIG_CMDLINE_EXTEND
  ARM64: copy CONFIG_CMDLINE_EXTEND from ARM
  of: Support CONFIG_CMDLINE_EXTEND config option
  ARM: decompressor: Flush tlb before swiching domain 0 to client mode
  ARM64: add option to build Image.gz/dtb combo
  ARM: convert build of appended dtb zImage to list of dtbs
  ARM: add config option to build zImage/dtb combo
  ARM: Fix dtb list when DTB_IMAGE_NAMES is empty
  ARM: Fix "Make low-level printk work" to use a separate config option
  ARM: add option to flush console before reboot
  ARM: Make low-level printk work
  Optionally flush entire dcache from v6_dma_flush_range
  process: Add display of memory around registers when displaying regs.
  staging: ion: Add X86 dependency for ION_POOL_CACHE_POLICY
  ion: Handle the memory mapping correctly on x86
  selinux: Android kernel compatibility with M userspace
  security: Add proper checks for Android specific capability checks
  uid_cputime: Check for the range while removing range of UIDs.
  uid_cputime: Iterates over all the threads instead of processes.
  uid_cputime: fix cputime overflow
  uid_cputime: Avoids double accounting of process stime, utime and cpu_power in task exit.
  uid_cputime: Extends the cputime functionality to report power per uid
  proc: uid_cputime: fix show_uid_stat permission
  proc: uid_cputime: create uids from kuids
  proc: uid: Adds accounting for the cputimes per uid.
  fixup! proc: make oom adjustment files user read-only
  proc: make oom adjustment files user read-only
  proc: smaps: Allow smaps access for CAP_SYS_RESOURCE
  prctl: reset PR_SET_TIMERSLACK_PID value to avoid conflict
  prctl: make PR_SET_TIMERSLACK_PID pid namespace aware
  prctl: fix misplaced PR_SET_TIMERSLACK_PID case
  prctl: adds the capable(CAP_SYS_NICE) check to PR_SET_TIMERSLACK_PID.
  prctl: adds PR_SET_TIMERSLACK_PID for setting timer slack of an arbitrary thread.
  cgroup: fix cgroup_taskset_for_each call in allow_attach() for 4.1
  include: linux: cgroup: Fix compiler warning
  Fix generic cgroup subsystem permission checks
  cgroup: Fix issues in allow_attach callback
  cgroup: memcg: pass correct argument to subsys_cgroup_allow_attach
  cgroup: Add generic cgroup subsystem permission checks
  memcg: add permission check
  cgroup: refactor allow_attach function into common code
  wakeup_reason: use vsnprintf instead of snsprintf for vargs.
  power: wakeup_reason: fix suspend time reporting
  wakeup: Add last wake up source logging for suspend abort reason.
  Power: Report suspend times from last_suspend_time
  power: Remove HAS_WAKELOCK config and document WAKELOCK
  Make suspend abort reason logging depend on CONFIG_PM_SLEEP
  power: Add check_wakeup_reason() to verify wakeup source irq
  power: Adds functionality to log the last suspend abort reason.
  power: Avoids bogus error messages for the suspend aborts.
  power: Add property CHARGE_COUNTER_EXT and 64-bit precision properties
  Power: Changes the permission to read only for sysfs file /sys/kernel/wakeup_reasons/last_resume_reason
  power: wakeup_reason: rename irq_count to irqcount
  Power: Add guard condition for maximum wakeup reasons
  POWER: fix compile warnings in log_wakeup_reason
  Power: add an API to log wakeup reasons
  PM / Suspend: Print wall time at suspend entry and exit
  power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED
  power: power_supply: add POWER_SUPPLY_PROP_USB_OTG
  power: power_supply: move POWER_SUPPLY_PROP_USB_HC to type 'int' order
  power_supply: Add custom property for USB High Current mode
  trace: power: add trace_clock_set_parent
  trace: fix compilation for 4.1
  trace/events: fix gpu event timestamp formatting
  trace: add non-hierarchical function_graph option
  trace: Add an option to show tgids in trace output
  trace/events: add gpu trace events
  video: adf: build fixes for 4.1
  video: adf: fix memblock build failure
  video: adf: fix wrong bitops in adf_modeinfo_to_fb_videomode()
  video: adf: Cleanup sw_sync timeline at adf_device_destroy
  video: adf: fbdev: add stubs for kernels without ADF_FBDEV
  video: adf: memblock: map buffer for dma
  video: adf: use rb_erase in adf_obj_destroy.
  video: adf: adf_memblock_export symbol should be exported
  video: adf: add buffer padding quirk
  video: adf: document adf_format_validate_yuv's origin
  video: adf: ensure consistent alignment on userspace facing structs
  video: adf: replace fbdev helper's open flag with refcount
  video: adf: export the adf_attachment_allow symbol to modules.
  video: adf: use %zu when printing size_t
  video: adf: fix compat ioctls calling ioctl with wrong cmd
  video: adf: use ADF_IOCTL_TYPE in compat ioctl definitions
  video: adf: define constants for device-custom ioctls
  video: adf: fix fbdev blank -> dpms state mapping
  video: adf: validate dpms state passed to blank
  video: adf: fix ADF_MAX_ATTACHMENTS declaration
  video: adf: remove PAGE_SIZE from userspace-facing header
  video: adf: make device node names less hierarchical
  video: adf: expose adf_modeinfo_set_{name,vrefresh} to drivers
  video: adf: set default interface dpms_state to OFF
  video: adf: make dpms_state sysfs attribute writable
  video: adf: add helpers for validating custom formats
  video: adf: add informational flags to interfaces
  video: adf: add fbdev compatibility helper
  video: adf: add supported formats to adf_overlay_engine_data
  video: adf: support "simple" buffers
  video: adf: add memblock helper
  video: add atomic display framework
  subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on current frequency
  cpufreq: interactive: replace strict_strtoul() with kstrtoul()
  cpufreq: interactive: Rearm governor timer at max freq
  cpufreq: interactive: Implement cluster-based min_sample_time
  cpufreq: interactive: Exercise hispeed settings at a policy level
  cpufreq: interactive: Round up timer_rate to match jiffy
  cpufreq: interactive: Don't set floor_validate_time during boost
  cpufreq: interactive: Put global cpufreq kobject on failure
  cpufreq: interactive: only boost tunable affected cpus
  cpufreq: interactive: don't skip waking up speedchange_task if target_freq > policy->cur
  cpufreq: interactive: make common_tunables static
  cpufreq: interactive: prevents the frequency to directly raise above the hispeed_freq from a lower frequency.
  cpufreq: interactive: remove compilation error from commit 49cc72365fb7ee87762a7ccc6a32ef68627216c5
  cpufreq: interactive: turn boost_pulse off on boost off
  cpufreq: interactive: restructure CPUFREQ_GOV_LIMITS
  cpufreq: interactive: hold reference on global cpufreq kobject if needed
  cpufreq: interactive: Use generic get_cpu_idle_time() from cpufreq.c
  cpufreq: interactive: fix NULL pointer dereference at sysfs ops
  cpufreq: interactive: fix compiling warnings
  cpufreq: interactive: delete timers for GOV_START
  cpufreq: Interactive: Implement per policy instances of governor
  cpufreq: interactive: Move definition of cpufreq_gov_interactive downwards
  cpufreq: interactive: Remove unnecessary cpu_online() check
  cpufreq: interactive: fix show_target_loads and show_above_hispeed_delay
  cpufreq: interactive: resched timer if max freq raised
  cpufreq: interactive: fix race on cpufreq TRANSITION notifier
  cpufreq: interactive: avoid underflow on active time calculation
  cpufreq: interactive: reduce chance of zero time delta on load eval
  cpufreq: interactive: handle errors from cpufreq_frequency_table_target
  cpufreq: interactive: fix uninitialized spinlock
  cpufreq: interactive: base above_hispeed_delay on target freq, not current
  cpufreq: interactive: fix crash on error paths in get_tokenized_data
  cpufreq: interactive: add io_is_busy interface
  cpufreq: interactive: allow arbitrary speed / delay mappings
  cpufreq: interactive: fix race on governor start/stop
  cpufreq: interactive: fix deadlock on spinlock in timer
  cpufreq: interactive: don't handle transition notification if not enabled
  cpufreq: interactive: init default values at compile time
  cpufreq: interactive: default go_hispeed_load 99%, doc updates
  cpufreq: interactive: fix race on timer restart on governor start
  cpufreq: interactive: fix racy timer stopping
  cpufreq: interactive: fix boosting logic
  cpufreq: interactive: add timer slack to limit idle at speed > min
  cpufreq: interactive: specify duration of CPU speed boost pulse
  cpufreq: interactive: adjust load for changes in speed
  cpufreq: interactive: remove load since last speed change
  cpufreq: interactive: allow arbitrary speed / target load mappings
  cpufreq: interactive: apply above_hispeed_delay to each step above hispeed
  cpufreq: interactive: change speed according to current speed and target load
  cpufreq: interactive: trace actual speed in target speed decisions
  cpufreq: interactive: kick timer on idle exit past expiry
  cpufreq: interactive: use deferrable timer by default
  cpufreq: interactive: pin timers to associated CPU
  cpufreq: interactive: run at fraction of hispeed_freq when load is low
  cpufreq: interactive: always limit initial speed bump to hispeed
  cpufreq: interactive: remove input_boost handling
  cpufreq: interactive: handle speed up and down in the realtime task
  cpufreq: interactive: keep freezer happy when not current governor
  cpufreq: interactive: take idle notifications only when active
  cpufreq: interactive: fixup trace of string params
  cpufreq: interactive: restart above_hispeed_delay at each hispeed load
  cpufreq-interactive: Compile fixup
  cpufreq: interactive: add boost pulse interface
  cpufreq: interactive: set floor for boosted speed
  cpufreq: interactive: Add sysfs boost interface for hints from userspace
  cpufreq: interactive: remove unused target_validate_time_in_idle
  cpufreq: interactive: Boost frequency on touchscreen input
  cpufreq: interactive: Separate speed target revalidate time and initial set time
  cpufreq: interactive: base hispeed bump on target freq, not actual
  cpufreq: interactive: adjust code and documentation to match
  cpufreq: interactive: configurable delay before raising above hispeed
  cpufreq: interactive: don't drop speed if recently at higher load
  cpufreq: interactive: set at least hispeed when above hispeed load
  cpufreq: interactive: apply intermediate load to max speed not current
  cpufreq interactive governor: event tracing
  cpufreq: interactive: New 'interactive' governor
  ARM: Call idle notifiers
  Move x86_64 idle notifiers to generic
  cpuidle: governor: menu: don't use loadavg
  sched: Enable might_sleep before initializing drivers.
  fiq_debugger: Add fiq_watchdog_triggered api
  fiq_debugger: Call fiq_debugger_printf through a function pointer from cpu specific code
  fiq_debugger: add ARM64 support
  fiq_debugger: split arm support into fiq_debugger_arm.c
  fiq_debugger: use pt_regs for registers
  fiq_debugger: allow compiling without CONFIG_FIQ_GLUE
  fiq_debugger: rename debug->fiq_debugger
  fiq_debugger: move into drivers/staging/android/fiq_debugger/
  ARM: fiq_glue: Add custom fiq return handler api.
  ARM: kgdb: ignore breakpoint instructions from user mode
  ARM: fiq_debugger: Update tty code for 3.9
  ARM: fiq_debugger: Use kmsg_dumper to dump kernel logs
  ARM: fiq_debugger: Fix to compile on 3.7
  ARM: fiq_debugger: fix uninitialised spin_lock.
  ARM: fiq_debugger: lock between tty and console writes
  ARM: fiq_debugger: add process context reboot command
  ARM: fiq_debugger: fix multiple consoles and make it a preferred console
  kdb: support new lines without carriage returns
  ARM: fiq_debugger: add support for kgdb
  ARM: fiq_debugger: add debug_putc
  ARM: fiq_debugger: add support for reboot commands
  ARM: fiq_debugger: fix compiling for v3.3
  ARM: Add generic fiq serial debugger
  ARM: Add fiq_glue
  fix false disconnect due to a signal sent to the reading process
  usb: gadget: cleanup: fix unused variable and function warnings
  usb: gadget: build audio_source function only if SND is enabled
  usb: gadget: configfs: handle gadget reset request for android
  ANDROID: usb: gadget: create F_midi device
  usb: gadget: Add device attribute to determine gadget state
  usb: phy: fix dual role sysfs build if kernel modules are supported
  usb: phy: Dual role sysfs class definition
  usb: gadget: fix NULL ptr derefer while symlinking PTP func
  usb:gadget:Add "state" attribute to android_device
  usb: gadget: Do not disconnect unregistered dev
  usb: gadget: Relocate f_accessory
  usb: gadget: Accessory:Migrate to USB_FUNCTION API
  usb: gadget: Move gadget functions code
  usb:gadget:audio_source: Move to USB_FUNCTION API
  usb: gadget: Add function devices to the parent
  usb: gadget: f_audio_source:replace deprecated API
  usb: gadget: check for accessory device before disconnecting HIDs
  usb: u_ether: Fix compile errors
  usb: gadget: Add Uevent to notify userspace
  usb: gadget: configfs: Add usb_function ptr to fi struct
  usb: gadget: mtp/ptp: Migrate functions to the USB_FUNCTION interface
  USB: gadget: rndis: Add module parameter for DL max packets per xfer
  ndis: Add debug support to disable RNDIS Multipacket Feature
  RNDIS: Add Data aggregation (multi packet) support
  USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode
  usb: u_ether: Add workqueue as bottom half handler for rx data path
  usb: Add support for rndis uplink aggregation
  USB: rndis: Free the rndis response queue during REMOTE_NDIS_RESET_MSG
  usb: gadget: f_audio_source: Fixed USB Audio Class Interface Descriptor
  usb: gadget: f_audio_source: change max ISO packet size
  usb: gadget: f_accessory: Enabled Zero Length Packet (ZLP) for acc_write
  drivers: usb: gadget: 64-bit related type fixes
  usb: gadget: f_accessory: move userspace interface to uapi
  usb: gadget: f_mtp: move userspace interface to uapi
  USB: remove duplicate out endpoint creation in MTP mode
  usb: gadget: Fix android gadget driver build
  usb: gadget: android: Fixes and hacks to make android usb gadget compile on 3.8
  usb: otg: otg-wakelock: Fix build for 3.7
  usb: gadget: accessory: Fix section mismatch (again)
  USB: gadget: f_audio_source: New gadget driver for audio output
  USB: gadget: f_accessory: Add support for HID input devices
  USB: gadget: Add ACCESSORY_SET_AUDIO_MODE control request and ioctl
  usb: gadget: accessory: Fix section mismatch
  usb: otg: otg-wakelock: Fix build for 3.4
  usb: gadget: adb: Only enable the gadget when adbd is ready
  usb: gadget: adb: do not set error flag when dequeuing req
  usb: gadget: adb: allow freezing in adb_read
  usb: gadget: accessory: Add Android Accessory function
  usb: gadget: adb: Add ADB function
  usb: gadget: mtp: Add MTP/PTP function
  usb: otg: otg-wakelock: fix build for 3.3
  usb: otg: Temporarily grab wakelock on charger and disconnect events
  USB: OTG: Take wakelock when VBUS present
  wlan: Add get_wake_irq functionality
  Add flags parameter to get_country_code template
  net: core: Handle 'sk' being NULL in UID-based routing
  net: core: Support UID-based routing.
  tcp: fix tcp_default_init_rwnd() for 4.1
  net: support marking accepting TCP sockets
  tcp: add a sysctl to config the tcp_default_init_rwnd
  netfilter: xt_qtaguid: xt_socket: build fixes
  net: xt_qtaguid/xt_socket: fix refcount underflow and crash
  xt_qtaguid: use sock_gen_put() instead of xt_socket_put_sk()
  xt_qtaguid: Use sk_callback_lock read locks before reading sk->sk_socket
  xt_qtaguid: fix broken uid/gid range check
  netfilter: Build fixups - kuid/kguid changes & xt_socket_get/put_sk
  net: PPPoPNS: Remove length argument from data_ready
  net: ipv6: fix build failure if IPV6_ROUTE_INFO config is enabled
  nf: IDLETIMER: Fix broken uid field in the msg
  nf: IDLETIMER: Adds the uid field in the msg
  net: wireless: Decrease scan entry expiration to avoid stall results
  netfilter: fix seq_printf type mismatch warning
  net: ipv6: autoconf routes into per-device tables
  nf: Remove compilation error caused by e8430cbed3ef15fdb1ac26cfd020e010aa5f1c35
  nf: IDLETIMER: time-stamp and suspend/resume handling.
  xt_qtaguid: Fix boot panic
  net: kuid/kguid build fixes
  netfilter: xt_qtaguid: 64-bit warning fixes
  netfilter: xt_qtaguid: fix memory leak in seq_file handlers
  net: move PPPoLAC and PPPoPNS headers to uapi
  netfilter: xt_qtaguid: fix bad tcp_time_wait sock handling
  netfilter: xt_qtaguid: 3.10 fixes
  netfilter: xt_quota2: 3.10 fixes.
  netfilter: qtaguid: rate limit some of the printks
  netfilter: xt_qtaguid: Allow tracking loopback
  netfilter: xt_qtaguid: extend iface stat to report protocols
  netfilter: xt_qtaguid: remove AID_* dependency for access control
  netfilter: qtaguid: Don't BUG_ON if create_if_tag_stat fails
  netfilter: xt_qtaguid: fix error exit that would keep a spinlock.
  netfilter: xt_qtaguid: report only uid tags to non-privileged processes
  netfilter: xt_qtaguid: start tracking iface rx/tx at low level
  netfilter: xt_IDLETIMER: Add new netlink msg type
  Include if_pppolac.h and if_pppopns.h into header-y target
  netfilter: xt_qtaguid: fix ipv6 protocol lookup
  netfilter: qtaguid: initialize a local var to keep compiler happy.
  net: Only NET_ADMIN is allowed to fully control TUN interfaces.
  bridge: Have tx_bytes count headers like rx_bytes.
  netfilter: ipv6: fix crash caused by ipv6_find_hdr()
  netfilter: fixup the quota2, and enable.
  netfilter: adding the original quota2 from xtables-addons
  netfilter: add xt_qtaguid matching module
  net: wireless: Add get_country_code functionality to platform
  network: wireless: Add get_mac_addr functionality to platform
  net: PPPoPNS and PPPoLAC update to use PPP_MRU instead of PPP_MRU
  net: Reorder incoming packets in PPPoLAC and PPPoPNS.
  wlan: Create generic wlan platform data header
  rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down
  net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW).
  security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().
  net: PPPoPNS and PPPoLAC fixes.
  net: add PPP on PPTP Network Server (PPPoPNS) driver.
  net: add PPP on L2TP Access Concentrator (PPPoLAC) driver.
  sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size
  Paranoid network.
  Add android_aid.h
  block: genhd: Add disk/partition specific uevent callbacks for partition info
  fs: block_dump: Don't display inode changes if block_dump < 2
  mmc: core: Remove stray CONFIG_EXPERIMENTAL dependencies
  mmc: sdio: Fix sdio_reset_comm for sync
  mmc: sdio: fix sdio_reset_comm() voltage selection
  mmc: Add "ignore mmc pm notify" functionality
  mmc: sdio: Fix enable_hs and enable_wide in sdio_reset_comm()
  mmc: sdio: Add high speed support to sdio_reset_comm()
  mmc: sdio: Claim host in sdio_reset_comm()
  mmc: sd: Add retries in re-detection
  mmc: sd: When resuming, try a little harder to init the card
  mmc: Add new API call 'sdio_reset_comm' for resetting communication with an SDIO device
  mmc: Add sdio_readb_ext() function
  mmc: Add concept of an 'embedded' SDIO device.
  mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection
  mtd: nand: Allow NAND chip ids to be included standalone.
  gpio_input: convert from wakelocks to wakeup sources
  input: Made keyreset more robust
  input: Changed keyreset to act as a wrapper for keycombo.
  input: add keycombo, a general key combo driver.
  input: misc: keychord: move header to uapi
  input: misc: keychord: log when keychord triggered
  input: keychord: Add keychord driver
  input: Add keyreset driver.
  input: misc: gpio_event: remove early suspend
  Input: Generic GPIO Input device.
  lowmemorykiller: use module_param_cb instead of __module_param_call
  lowmemorykiller: trace kill events.
  staging: android: lowmemorykiller: Add config option to support oom_adj values
  Shrink ashmem directly through shmem_fallocate
  ashmem: Add shmem_set_file to mm/shmem.c
  PM / Sleep: Add wake lock api wrapper on top of wakeup sources
  android: Add android config documentation to boot framework.

CRs-Fixed: 1046658
Change-Id: I02df527deb1310bfee468bc8e3b7b9c6a7ffe793
Signed-off-by: Bruce Levy <blevy@codeaurora.org>