Greg Kroah-Hartman 5bd2010fbe Merge 3.13-rc5 into staging-next ...

We want these fixes here to handle some merge issues.

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

2013-12-24 09:43:21 -08:00

..

altera-stapl

…

c2port

c2port: convert class code to use bin_attrs in groups

2013-07-24 15:39:05 -07:00

carma

Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

2013-11-20 13:20:24 -08:00

cb710

mmc: cb710: drop free_irq for devm_request_irq allocated irq

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

eeprom

Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2013-11-18 15:50:07 -08:00

ibmasm

misc: ibmasm: remove unnecessary pci_set_drvdata()

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

lis3lv02d

misc: replace strict_strtoul() with kstrtoul()

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

mei

mei: add 9 series PCH mei device ids

2013-12-05 09:48:23 -08:00

mic

Merge 3.13-rc5 into staging-next

2013-12-24 09:43:21 -08: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

tree-wide: use reinit_completion instead of INIT_COMPLETION

2013-11-15 09:32:21 +09:00

vmw_vmci

vmw_vmci: Convert driver to use get_user_pages_fast()

2013-10-05 18:04:55 -07:00

ad525x_dpot-i2c.c

…

ad525x_dpot-spi.c

…

ad525x_dpot.c

misc: replace strict_strtoul() with kstrtoul()

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

ad525x_dpot.h

…

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 deprecated IRQF_DISABLED

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

atmel_pwm.c

misc: atmel_pwm: add deferred-probing support

2013-10-29 16:22:57 -07:00

atmel_tclib.c

…

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: bh1780: probe from compatible string

2013-10-03 16:02:35 -07:00

bmp085-i2c.c

…

bmp085-spi.c

…

bmp085.c

drivers: misc: bmp085: remove '__init' from mp085_get_of_properties()

2013-09-26 08:44:40 -07:00

bmp085.h

…

cs5535-mfgpt.c

…

ds1682.c

…

dummy-irq.c

treewide: Fix typo in printk

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

enclosure.c

[SCSI] enclosure: fix WARN_ON in dual path device removing

2013-12-02 11:13:14 -08: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

drivers/misc/hpilo: Correct panic when an AUX iLO is detected

2013-08-14 14:46:22 -07:00

hpilo.h

…

ics932s401.c

hwmon: Change my email address.

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

ioc4.c

…

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

Merge tag 'pwm/for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2013-11-16 12:21:40 -08:00

kgdbts.c

…

lattice-ecp3-config.c

treewide: Fix typo in printk

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

lkdtm.c

lkdtm: add tests for additional page permissions

2013-10-29 16:13:39 -07:00

Makefile

Merge tag 'pwm/for-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

2013-11-16 12:21:40 -08: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: 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

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

drivers: misc: ti_dac7512: add support for DT matching

2013-09-26 09:04:06 -07:00

tifm_7xx1.c

tifm: fix error return code in tifm_7xx1_probe()

2013-10-30 10:19:30 -07:00

tifm_core.c

tifm: convert bus code to use dev_groups

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

tsl2550.c

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

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

vmw_balloon.c

misc: vmw_balloon: Remove braces to fix build for clang.

2013-08-27 21:51:21 -07:00