Greg Kroah-Hartman 9c5891bd43 Merge 3.11-rc3 into char-misc-next. ...

This resolves a merge issue with:
	drivers/misc/mei/init.c

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

2013-07-29 11:50:17 -07:00

..

altera-stapl

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2011-10-31 15:42:54 -07:00

c2port

Revert "misc: c2port: use dev_bin_attrs instead of hand-coding it"

2013-07-24 15:28:02 -07:00

carma

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

cb710

drivers/misc/cb710: add missing GENERIC_HARDIRQS dependency

2013-02-08 12:23:53 -08:00

eeprom

drivers/misc: at25: convert to use devm_kzalloc

2013-05-30 21:49:32 +09:00

ibmasm

fs: Limit sys_mount to only request filesystem modules.

2013-03-03 19:36:31 -08:00

lis3lv02d

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

mei

Merge 3.11-rc3 into char-misc-next.

2013-07-29 11:50:17 -07:00

sgi-gru

drivers/misc/sgi-gru/grufault.c: fix a sanity test in gru_set_context_option()

2013-07-03 16:07:42 -07:00

sgi-xp

sgi: xpc: Convert use of typedef ctl_table to struct ctl_table

2013-06-14 10:19:25 +02:00

ti-st

misc: use platform_{get,set}_drvdata()

2013-05-30 21:46:15 +09:00

vmw_vmci

Hoist memcpy_fromiovec/memcpy_toiovec into lib/

2013-05-20 10:24:22 +09:30

ad525x_dpot-i2c.c

misc: remove use of __devexit

2012-11-21 12:53:32 -08:00

ad525x_dpot-spi.c

misc: remove use of __devexit

2012-11-21 12:53:32 -08:00

ad525x_dpot.c

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -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: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

apds9802als.c

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

arm-charlcd.c

misc: arm-charlcd: remove unnecessary platform_set_drvdata()

2013-05-16 18:11:13 -07:00

atmel_pwm.c

misc: atmel_pwm: use module_platform_driver_probe()

2013-03-15 11:10:49 -07:00

atmel_tclib.c

ARM: at91/tc/clocksource: Add 32 bit variant to Timer Counter

2012-03-01 13:38:49 +01:00

atmel-ssc.c

Merge 3.11-rc3 into char-misc-next.

2013-07-29 11:50:17 -07:00

bh1770glc.c

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

bh1780gli.c

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

bmp085-i2c.c

misc: remove use of __devinit

2012-11-21 12:51:53 -08:00

bmp085-spi.c

misc: remove use of __devinit

2012-11-21 12:51:53 -08:00

bmp085.c

misc: remove use of __devinit

2012-11-21 12:51:53 -08:00

bmp085.h

misc: add support for bmp18x chips to the bmp085 driver

2012-04-18 14:57:14 -07:00

cs5535-mfgpt.c

cs5535-mfgpt: Fix quotation marks

2013-04-03 11:23:13 -07:00

ds1682.c

MISC: convert drivers/misc/* to use module_i2c_driver()

2012-01-24 16:31:49 -08:00

dummy-irq.c

treewide: Fix typo in printk

2013-05-28 12:02:13 +02:00

enclosure.c

[SCSI] enclosure: fix error path - actually return ERR_PTR() on error

2010-07-27 12:03:48 -05:00

ep93xx_pwm.c

misc/ep93xx_pwm: use kstrtol instead of strict_strtol

2013-05-30 21:54:07 +09:00

fsa9480.c

misc: fsa8480: Use dev_pm_ops

2013-04-11 12:39:02 -07:00

hmc6352.c

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

hpilo.c

misc: remove use of __devinit

2012-11-21 12:51:53 -08:00

hpilo.h

misc: hpilo: increase number of max supported channels

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

ics932s401.c

MISC: convert drivers/misc/* to use module_i2c_driver()

2012-01-24 16:31:49 -08:00

ioc4.c

misc: remove use of __devexit

2012-11-21 12:53:32 -08:00

isl29003.c

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

isl29020.c

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

Kconfig

Driver core patches for 3.11-rc1

2013-07-02 11:44:19 -07:00

kgdbts.c

kgdb/kgdbts: support ppc64

2013-03-02 08:52:17 -06:00

lattice-ecp3-config.c

treewide: Fix typo in printk

2013-05-28 12:02:13 +02:00

lkdtm.c

lkdtm: add "EXEC_*" triggers

2013-07-24 22:47:20 -07:00

Makefile

misc: generic on-chip SRAM allocation driver

2013-04-29 18:28:13 -07:00

pch_phub.c

pch_phub: fix error return code in pch_phub_probe()

2013-06-06 12:54:08 -07:00

phantom.c

misc: remove use of __devexit

2012-11-21 12:53:32 -08:00

pti.c

TTY/Serial merge for 3.8-rc1

2012-12-11 14:08:47 -08:00

spear13xx_pcie_gadget.c

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

sram.c

misc: sram: fix error path in sram_probe

2013-07-24 22:54:50 -07:00

ti_dac7512.c

misc: replace strict_strtoul() with kstrtoul()

2013-06-06 12:54:08 -07:00

tifm_7xx1.c

tifm: use module_pci_driver

2012-09-05 14:10:29 -07:00

tifm_core.c

misc/tifm_core: convert to idr_alloc()

2013-02-27 19:10:17 -08:00

tsl2550.c

Drivers: Misc: tsl2250: fix warnings, unsigned long will never < 0

2013-05-16 18:11:12 -07:00

vmw_balloon.c

vmw_balloon: fix for a -Wuninitialized warning

2012-02-02 16:28:13 -08:00