Amit Pundir 839f249169 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ...

Conflicts due to AOSP's backported commits:
    fs/f2fs/crypto.c
    fs/f2fs/crypto_fname.c
        Deleted by AOSP commit c1286ff41c ("f2fs: backport from (4c1fad64 -
        Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)")

    fs/f2fs/crypto_key.c
    fs/f2fs/data.c
    fs/f2fs/file.c
        AOSP commit 13f002354d ("f2fs: catch up to v4.14-rc1")
        override most of stable 4.4.y changes.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

2017-11-20 20:53:19 +05:30

..

altera-stapl

drivers/misc/altera-stapl/altera.c: remove extraneous KERN_INFO prefix

2015-06-25 17:00:38 -07:00

c2port

drivers/misc/c2port/c2port-duramar2150.c: checking for NULL instead of IS_ERR()

2017-06-26 07:13:10 +02:00

cb710

mmc: cb710: drop free_irq for devm_request_irq allocated irq

2013-09-26 13:55:30 -07:00

cxl

cxl: Fix driver use count

2017-10-05 09:41:47 +02:00

echo

staging: echo: move to drivers/misc/

2014-02-28 14:08:42 -08:00

eeprom

Merge tag 'mfd-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

2015-11-06 10:23:50 -08:00

genwqe

GenWQE: Fix bad page access during abort of resource allocation

2016-11-10 16:36:33 +01:00

ibmasm

misc: ibmasm: remove unnecessary pci_set_drvdata()

2013-09-26 09:13:54 -07:00

lis3lv02d

spi: Drop owner assignment from spi_drivers

2015-10-28 10:30:17 +09:00

mei

mei: return error on notification request to a disconnected client

2017-11-08 10:06:30 +01:00

mic

misc: mic/scif: fix wrap around tests

2016-05-04 14:48:51 -07:00

sgi-gru

misc: sgi-gru: fix return of error

2015-10-04 12:55:59 +01:00

sgi-xp

mm: rename alloc_pages_exact_node() to __alloc_pages_node()

2015-09-08 15:35:28 -07:00

ti-st

ti-st: use worker instead of calling st_int_write in wake up

2015-09-20 22:52:13 -07:00

vmw_vmci

misc/vmw_vmci: use kmemdup rather than duplicating its implementation

2015-09-20 19:27:58 -07:00

ad525x_dpot-i2c.c

misc: ad525x_dpot: Remove unnecessary MODULE_ALIAS()

2015-09-20 19:33:29 -07:00

ad525x_dpot-spi.c

spi: Drop owner assignment from spi_drivers

2015-10-28 10:30:17 +09:00

ad525x_dpot.c

drivers/misc/ad525x_dpot: AD5274 fix RDAC read back errors

2016-05-04 14:48:52 -07:00

ad525x_dpot.h

Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2012-01-09 12:08:59 -08:00

apds990x.c

misc: Drop owner assignment from i2c_driver

2015-08-10 08:37:35 +02:00

apds9802als.c

drivers/misc: delete non-required instances of include <linux/init.h>

2014-02-07 15:10:19 -08:00

arm-charlcd.c

misc: drop owner assignment from platform_drivers

2014-10-20 16:20:54 +02:00

atmel_tclib.c

misc: atmel_tclib: get and use slow clock

2015-10-06 12:33:14 +02:00

atmel-ssc.c

Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2014-12-14 16:43:47 -08:00

bh1770glc.c

misc: Drop owner assignment from i2c_driver

2015-08-10 08:37:35 +02:00

bh1780gli.c

misc: bh1780: Add module aliases

2015-03-16 21:10:28 +01:00

bmp085-i2c.c

misc: Drop owner assignment from i2c_driver

2015-08-10 08:37:35 +02:00

bmp085-spi.c

spi: Drop owner assignment from spi_drivers

2015-10-28 10:30:17 +09:00

bmp085.c

drivers/misc: delete non-required instances of include <linux/init.h>

2014-02-07 15:10:19 -08:00

bmp085.h

misc: bmp085: Clean up and enable use of interrupt for completion.

2013-12-04 20:23:51 -08:00

cs5535-mfgpt.c

misc: drop owner assignment from platform_drivers

2014-10-20 16:20:54 +02:00

ds1682.c

misc: ds1682: clean up ds1682_eeprom_read() and ds1682_eeprom_write()

2015-08-05 13:53:39 -07:00

dummy-irq.c

Add MODULE_DESCRIPTION to dummy-irq.c and lkdtm.c in drivers/misc

2014-07-09 14:19:34 -07:00

enclosure.c

scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails.

2017-07-27 15:06:04 -07:00

fsa9480.c

treewide: fix comments and printk msgs

2014-01-07 15:06:07 +01:00

hmc6352.c

drivers/misc: delete non-required instances of include <linux/init.h>

2014-02-07 15:10:19 -08:00

hpilo.c

misc: hpilo: Change e-mail address from hp.com to hpe.com

2015-10-04 12:42:33 +01:00

hpilo.h

misc: hpilo: increase number of max supported channels

2012-06-14 17:22:12 -07:00

ics932s401.c

hwmon: Change my email address.

2013-08-27 08:28:01 -07:00

ioc4.c

misc: ioc4: simplify wave period measurement in clock_calibrate

2015-01-12 05:04:11 -08:00

isl29003.c

misc: Drop owner assignment from i2c_driver

2015-08-10 08:37:35 +02:00

isl29020.c

drivers/misc: delete non-required instances of include <linux/init.h>

2014-02-07 15:10:19 -08:00

Kconfig

uid_sys_stats: log task io with a debug flag

2017-09-18 21:14:29 +01:00

kgdbts.c

drivers/misc: make kgdbts.c slightly more explicitly non-modular

2015-09-20 19:32:35 -07:00

lattice-ecp3-config.c

spi: Drop owner assignment from spi_drivers

2015-10-28 10:30:17 +09:00

lkdtm.c

lkdtm: Verify that '__ro_after_init' works correctly

2016-03-17 18:51:51 +00:00

Makefile

ANDROID: uid_sys_stats: rename uid_cputime.c to uid_sys_stats.c

2017-04-10 13:12:16 +05:30

memory_state_time.c

ANDROID: memory_state_time: fix undefined behavior with missing DT properties

2017-05-25 16:37:25 +05:30

pch_phub.c

pch_phub: Build context save/restore only for PM

2014-11-07 10:28:36 -08:00

phantom.c

misc: phantom: remove deprecated IRQF_DISABLED

2013-10-16 12:36:10 -07:00

pti.c

misc: pti: remove unnecessary pci_set_drvdata()

2013-09-26 09:13:54 -07:00

qcom-coincell.c

ARM: qcom: Add coincell charger driver

2015-07-29 13:37:18 -07:00

spear13xx_pcie_gadget.c

spear13xx_pcie_gadget: use per-attribute show and store methods

2015-10-13 22:17:40 -07:00

sram.c

misc: sram: partition base address belongs to __iomem space

2015-10-18 19:00:36 -07:00

ti_dac7512.c

spi: Drop owner assignment from spi_drivers

2015-10-28 10:30:17 +09:00

tifm_7xx1.c

misc: tifm: match return type of wait_for_completion_timeout

2015-03-25 11:36:38 +01:00

tifm_core.c

tifm: convert bus code to use dev_groups

2013-10-16 18:40:58 -07:00

tsl2550.c

misc: Drop owner assignment from i2c_driver

2015-08-10 08:37:35 +02:00

uid_sys_stats.c

ANDROID: uid_sys_stats: Fix implicit declaration of get_cmdline()

2017-09-18 21:14:29 +01:00

vexpress-syscfg.c

ARM: vexpress: Remove non-DT code

2014-11-28 16:08:16 +01:00

vmw_balloon.c

mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIM

2015-11-06 17:50:42 -08:00