Greg Kroah-Hartman bb27d4998a Merge char-misc-next into staging-next ...

This resolves the merge issues and confusions people were having with
the goldfish drivers due to changes for them showing up in two different
trees.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2016-02-22 14:46:24 -08:00

..

altera-stapl

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

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

c2port

misc: c2port: use kobj_to_dev()

2016-02-07 23:01:45 -08:00

cb710

mmc: cb710: drop free_irq for devm_request_irq allocated irq

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

cxl

misc: cxl: use kobj_to_dev()

2016-02-07 23:01:45 -08:00

echo

staging: echo: move to drivers/misc/

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

eeprom

misc: eeprom_93xx46: Add support for a GPIO 'select' line.

2016-02-11 19:23:28 -08:00

genwqe

GenWQE: use kobj_to_dev()

2016-02-08 14:57:30 -08:00

ibmasm

misc: ibmasm: Replace timeval with timespec64

2016-02-11 20:06:46 -08:00

lis3lv02d

misc: apds990x, bh1770glc, lis3lv02d: use to_i2c_client

2016-02-07 23:01:45 -08:00

mei

mei: fix format string in debug prints

2016-02-20 14:27:36 -08:00

mic

misc: mic: silence an overflow warning

2016-02-14 17:42:37 -08: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

misc: st_core: remove unreachable code

2016-02-07 23:01:45 -08:00

vmw_vmci

VMCI: Use 32bit atomics for queue headers on X86_32

2016-02-07 21:36:02 -08: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

ad525x_dpot:Remove break after return

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

ad525x_dpot.h

…

apds990x.c

misc: apds990x, bh1770glc, lis3lv02d: use to_i2c_client

2016-02-07 23:01:45 -08: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

drivers/misc: make arm-charlcd.c explicitly non-modular

2016-02-07 23:01:45 -08:00

atmel_tclib.c

misc: atmel_tclib: get and use slow clock

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

atmel-ssc.c

Char/Misc driver patches for 3.19-rc1

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

bh1770glc.c

misc: apds990x, bh1770glc, lis3lv02d: use to_i2c_client

2016-02-07 23:01:45 -08: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

enclosure: fix WARN_ON removing an adapter in multi-path devices

2015-03-31 08:53:36 +03: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

…

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

Merge char-misc-next into staging-next

2016-02-22 14:46:24 -08: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: mark execute_location as noinline

2016-02-09 17:31:50 -08:00

Makefile

misc: Move panel driver out of staging

2016-02-03 14:14:22 -08:00

panel.c

misc: panel, convert struct to bitmap

2016-02-11 19:24:23 -08:00

pch_phub.c

pch_phub: use kobj_to_dev()

2016-02-08 14:57:30 -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

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