Arnd Bergmann 43872fa788 Merge branch 'depends/rmk/gpio' into next/fixes ...

This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

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

2011-10-31 22:44:18 +01:00

..

hvc

powerpc/pseries: Fix hvc_vio.c build due to recent changes

2011-07-20 18:01:48 +10:00

ipwireless

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2011-05-24 13:28:35 -07:00

serial

Merge branch 'depends/rmk/gpio' into next/fixes

2011-10-31 22:44:18 +01:00

vt

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

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

amiserial.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

bfin_jtag_comm.c

atomic: use <linux/atomic.h>

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

cyclades.c

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2011-05-26 13:19:00 -07:00

isicom.c

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

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

Kconfig

n_tracerouter and n_tracesink ldisc additions.

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

Makefile

n_tracerouter and n_tracesink ldisc additions.

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

moxa.c

drivers/tty: use printk_ratelimited() instead of printk_ratelimit()

2011-07-01 15:35:45 -07: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

drivers/tty: use printk_ratelimited() instead of printk_ratelimit()

2011-07-01 15:35:45 -07:00

mxser.h

Fix common misspellings

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

n_gsm.c

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-07-25 23:09:27 -07:00

n_hdlc.c

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

2011-06-04 06:33:24 +09: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

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-07-25 23:09:27 -07:00

nozomi.c

Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

2011-05-26 13:19:00 -07:00

pty.c

TTY: pty, fix pty counting

2011-08-23 10:10:38 -07: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

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07: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

Fix common misspellings

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

synclink.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

synclinkmp.c

Fix common misspellings

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

sysrq.c

lib, arch: add filter argument to show_mem and fix private implementations

2011-03-24 17:49:37 -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

TTY: pty, fix pty counting

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

tty_ioctl.c

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-05-23 12:23:20 -07:00

tty_ldisc.c

TTY: ldisc, do not close until there are readers

2011-06-07 10:16:54 -07:00

tty_mutex.c

tty: remove invalid location line in file header

2011-04-19 16:33:36 -07:00

tty_port.c

…