Merge 3.18.115 into android-3.18
Changes in 3.18.115
n_tty: Fix stall at n_tty_receive_char_special().
staging: android: ion: Return an ERR_PTR in ion_map_kernel
x86/boot: Fix early command-line parsing when matching at end
ubi: fastmap: Correctly handle interrupted erasures in EBA
netfilter: ebtables: handle string from userspace with care
atm: zatm: fix memcmp casting
net: qmi_wwan: Add Netgear Aircard 779S
net/sonic: Use dma_mapping_error()
scsi: sg: mitigate read/write abuse
cifs: Fix infinite loop when using hard mount option
ext4: make sure bitmaps and the inode table don't overlap with bg descriptors
ext4: clear i_data in ext4_inode_info when removing inline data
ext4: add more mount time checks of the superblock
HID: i2c-hid: Fix "incomplete report" noise
HID: debug: check length before copy_to_user()
media: cx25840: Use subdev host data for PLL override
dm bufio: avoid sleeping while holding the dm_bufio lock
dm bufio: drop the lock when doing GFP_NOIO allocation
mtd: rawnand: mxc: set spare area size register explicitly
mtd: cfi_cmdset_0002: Change definition naming to retry write operation
mtd: cfi_cmdset_0002: Change erase functions to retry for error
mtd: cfi_cmdset_0002: Change erase functions to check chip good only
netfilter: nf_log: don't hold nf_log_mutex during user access
Linux 3.18.115
Change-Id: I9defbf95d3615a840d06d9e886f28ccf7aba2d2b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
