Arnd Bergmann 4f5a9fd341 Merge branch 'imx/pinctrl' into imx/clock ...

Conflicts:
	drivers/mmc/host/sdhci-esdhc-imx.c
	drivers/net/ethernet/freescale/fec.c
	drivers/spi/spi-imx.c
	drivers/tty/serial/imx.c

This resolves dependencies between the pinctrl and clock changes
in imx.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-05-14 15:30:52 +02:00

..

hvc

powerpc+sparc/vio: Modernize driver registration

2012-03-28 11:33:24 +11:00

ipwireless

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2012-03-20 21:04:47 -07:00

serial

Merge branch 'imx/pinctrl' into imx/clock

2012-05-14 15:30:52 +02:00

vt

printk(): add KERN_CONT where needed in hpet and vt code

2012-04-09 10:30:39 -07:00

amiserial.c

drivers/tty/amiserial.c: add missing tty_unlock

2012-04-19 19:15:35 -07:00

bfin_jtag_comm.c

TTY: remove re-assignments to tty_driver members

2012-03-08 11:37:58 -08:00

cyclades.c

TTY: remove unneeded tty->index checks

2012-03-08 11:42:21 -08:00

ehv_bytechan.c

TTY: remove re-assignments to tty_driver members

2012-03-08 11:37:58 -08:00

isicom.c

Documentation: remove references to /etc/modprobe.conf

2012-03-30 16:03:15 -07:00

Kconfig

tty/powerpc: early udbg consoles can't be modules

2012-02-24 16:11:50 -08:00

Makefile

tty/powerpc: introduce the ePAPR embedded hypervisor byte channel driver

2011-08-23 10:32:56 -07:00

moxa.c

Remove all #inclusions of asm/system.h

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

moxa.h

tty: move a number of tty drivers from drivers/char/ to drivers/tty/

2011-02-22 16:14:56 -08:00

mxser.c

Remove all #inclusions of asm/system.h

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

mxser.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

n_gsm.c

TTY: remove re-assignments to tty_driver members

2012-03-08 11:37:58 -08:00

n_hdlc.c

Remove all #inclusions of asm/system.h

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

n_r3964.c

Revert "tty: make receive_buf() return the amout of bytes received"

2011-06-04 06:33:24 +09:00

n_tracerouter.c

n_tracerouter and n_tracesink ldisc additions.

2011-05-13 16:31:00 -07:00

n_tracesink.c

n_tracerouter and n_tracesink ldisc additions.

2011-05-13 16:31:00 -07:00

n_tracesink.h

n_tracerouter and n_tracesink ldisc additions.

2011-05-13 16:31:00 -07:00

n_tty.c

Remove all #inclusions of asm/system.h

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

nozomi.c

TTY: remove re-assignments to tty_driver members

2012-03-08 11:37:58 -08:00

pty.c

Remove all #inclusions of asm/system.h

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

rocket_int.h

tty: move a number of tty drivers from drivers/char/ to drivers/tty/

2011-02-22 16:14:56 -08:00

rocket.c

TTY: remove unneeded tty->index checks

2012-03-08 11:42:21 -08:00

rocket.h

tty: move a number of tty drivers from drivers/char/ to drivers/tty/

2011-02-22 16:14:56 -08:00

synclink_gt.c

Remove all #inclusions of asm/system.h

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

synclink.c

Remove all #inclusions of asm/system.h

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

synclinkmp.c

Remove all #inclusions of asm/system.h

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

sysrq.c

sysrq: use SEND_SIG_FORCED instead of force_sig()

2012-04-05 15:25:50 -07:00

tty_audit.c

tty_audit: fix tty_audit_add_data live lock on audit disabled

2011-03-07 12:04:50 -08:00

tty_buffer.c

tty_buffer: get rid of 'seen_tail' logic in flush_to_ldisc

2011-06-08 07:46:30 -07:00

tty_io.c

Remove all #inclusions of asm/system.h

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

tty_ioctl.c

Remove all #inclusions of asm/system.h

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

tty_ldisc.c

Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c

2011-11-26 20:07:25 -08:00

tty_mutex.c

TTY: remove tty_locked

2011-08-23 10:34:07 -07:00

tty_port.c

TTY: fix UV serial console regression

2012-01-24 12:55:37 -08:00