From: Huang, Tao <huangtao@rock-chips.com>
Date: Thu, 3 Mar 2016 11:42:14 +0000 (+0800)
Subject: Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common
X-Git-Tag: firefly_0821_release~3309
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5b1f5a99409a92d32917104d2b5f1112bb3779e0;p=firefly-linux-kernel-4.4.55.git

Merge branch 'android-4.4' of https://android.googlesource.com/kernel/common

* android-4.4:
  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: mmc: Move tracepoint creation and export symbols
  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
  net: diag: support v4mapped sockets in inet_diag_find_one_icsk()
  net: tcp: deal with listen sockets properly in tcp_abort.
  tcp: diag: add support for request sockets to tcp_abort()
  net: diag: Support destroying TCP sockets.
  net: diag: Support SOCK_DESTROY for inet sockets.
  net: diag: Add the ability to destroy a socket.
  net: diag: split inet_diag_dump_one_icsk into two
  Revert "mmc: Extend wakelock if bus is dead"
  Revert "mmc: core: Hold a wake lock accross delayed work + mmc rescan"
  ANDROID: mmc: move to a SCHED_FIFO thread
---

5b1f5a99409a92d32917104d2b5f1112bb3779e0