Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common
* android-3.18:
net: fix crash in tcp_nuke_addr()
net: xt_qtaguid/xt_socket: fix refcount underflow and crash
net: fix iterating over hashtable in tcp_nuke_addr()
nf: IDLETIMER: fix lockdep warning
ANDROID: usb: gadget: create F_midi device
usb: gadget: midi: avoid redundant f_midi_set_alt() call
usb: gadget: f_midi: fix error recovery path
usb: gadget: f_midi: fix segfault when reading empty id
usb: gadget: fix misspelling of current function in string
usb: gadget: midi: f_midi_alloc() can be static
usb: gadget: f_midi: add configfs support
usb: gadget: f_midi: use usb_gstrings_attach
usb: gadget: f_midi: remove compatibility layer
usb: gadget: f_midi: convert to new function interface with backward compatibility
usb: gadget: f_midi: check kstrdup() return value
usb: gadget: f_midi: enable use of the index parameter
usb: gadget: configfs: Fix interfaces array NULL-termination
usb: gadget: Add device attribute to determine gadget state
usb: phy: fix dual role sysfs build if kernel modules are supported
ion: Handle the memory mapping correctly on x86
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
drivers/usb/gadget/Kconfig
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/legacy/gmidi.c
==> All the conflicts in these ^^ files are due to merging
of AOSP backport of upstream Midi USB gadget. So keep the
upstream changes and discard AOSP changes.
drivers/usb/gadget/configfs.c
==> Add changes from AOSP commit 492097142eef "usb: gadget:
Add device attribute to determine gadget state" and remove
linaro fix commit acfdf575920d "usb: gadget: configfs: fix
unused variable warnings".
drivers/usb/gadget/function/f_midi.c
==> Add changes from AOSP commit 19088ddf7fd9
"ANDROID: usb: gadget: create F_midi device".
net/ipv4/tcp.c
==> Add changes from AOSP commit 3ac97f2411ad "net: fix
crash in tcp_nuke_addr()" and remove linaro fix commit
33e405ea3985 "net/ipv4: android: don't nuke sockets on
TCP_TIME_WAIT"
net/netfilter/xt_socket.c
==> Add changes from AOSP commit 6265ed1db967 "net:
xt_qtaguid/xt_socket: fix refcount underflow and crash".