Greg Kroah-Hartman c87985a3ce Merge tty-next into 3.6-rc1 ...

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

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

2012-08-06 09:48:31 -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

c2port: fix bogus Kconfig "default no"

2012-05-07 15:00:19 +02:00

carma

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

2012-03-21 18:55:10 -07:00

cb710

PCI: do not call pci_set_power_state with PCI_D3cold

2012-06-23 10:50:44 -06:00

eeprom

misc: at25: Parse dt settings

2012-06-14 17:23:04 -07:00

ibmasm

8250: three way resolve of the 8250 diffs

2012-07-17 09:11:50 -07:00

lis3lv02d

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

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

mei

mei: use module_pci_driver

2012-07-19 15:33:30 -07:00

sgi-gru

Add #includes needed to permit the removal of asm/system.h

2012-03-28 18:30:03 +01:00

sgi-xp

sgi-xp: nested calls to spin_lock_irqsave()

2012-07-11 16:04:47 -07:00

ti-st

drivers/misc/ti-st/st_core.c: missing NULL check

2012-07-30 17:25:13 -07:00

ab8500-pwm.c

mfd: Register ab8500 devices using the newly DT:ed MFD API

2012-07-09 00:16:13 +02:00

ad525x_dpot-i2c.c

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

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

ad525x_dpot-spi.c

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

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

ad525x_dpot.c

misc: do not mark exported functions __devexit

2012-04-18 14:54:31 -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: convert drivers/misc/* to use module_i2c_driver()

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

apds9802als.c

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

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

arm-charlcd.c

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

atmel_pwm.c

treewide: Convert uses of struct resource to resource_size(ptr)

2011-06-10 14:55:36 +02: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

drivers/misc: Add module.h to files who are really modular.

2011-10-31 19:31:53 -04:00

bh1770glc.c

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

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

bh1780gli.c

misc: add missing __devexit_p() annotations

2012-04-18 14:54:31 -07:00

bmp085-i2c.c

misc: add support for bmp18x chips to the bmp085 driver

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

bmp085-spi.c

misc: add support for bmp18x chips to the bmp085 driver

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

bmp085.c

misc: add support for bmp18x chips to the bmp085 driver

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

bmp085.h

misc: add support for bmp18x chips to the bmp085 driver

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

cs5535-mfgpt.c

char and misc driver merge for 3.4-rc1

2012-03-20 11:15:18 -07:00

ds1682.c

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

2012-01-24 16:31:49 -08: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

drivers/misc/ep93xx_pwm.c: world-writable sysfs files

2011-03-22 17:44:11 -07:00

fsa9480.c

misc: fsa9480: Remove obsolete cleanup for clientdata

2012-02-24 14:16:42 -08:00

hmc6352.c

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

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

hpilo.c

misc: hpilo: increase number of max supported channels

2012-06-14 17:22:12 -07: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

drivers/misc/ioc4.c: fix section mismatch / race condition

2011-06-27 18:00:13 -07:00

isl29003.c

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

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

isl29020.c

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

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

Kconfig

Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm

2012-07-30 09:22:37 -07:00

kgdbts.c

x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()

2012-03-29 17:41:25 -05:00

lkdtm.c

drivers/misc/lkdtm.c: fix missing allocation failure check

2012-07-30 17:25:22 -07:00

Makefile

iwmc3200top: remove driver for unavailable hardware

2012-07-11 15:40:22 -04:00

pch_phub.c

pch_phub: delete duplicate definitions

2012-04-18 14:53:51 -07:00

phantom.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

pti.c

misc: add missing __devexit_p() annotations

2012-04-18 14:54:31 -07:00

spear13xx_pcie_gadget.c

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

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

ti_dac7512.c

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

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

tifm_7xx1.c

drivers/misc: Add module.h to files who are really modular.

2011-10-31 19:31:53 -04:00

tifm_core.c

drivers/misc: Add module.h to files who are really modular.

2011-10-31 19:31:53 -04:00

tsl2550.c

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

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

vmw_balloon.c

vmw_balloon: fix for a -Wuninitialized warning

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