Ralf Baechle edb15d83a8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next ...

Conflicts:
    include/linux/ssb/ssb_driver_gige.h

Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.

2013-02-22 10:07:30 +01:00

..

hvc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

ipwireless

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-12-13 12:00:02 -08:00

serial

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next

2013-02-22 10:07:30 +01:00

vt

TTY/Serial merge for 3.8-rc1

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

amiserial.c

TTY: call tty_port_destroy in the rest of drivers

2012-11-15 17:20:58 -08:00

bfin_jtag_comm.c

TTY: call tty_port_destroy in the rest of drivers

2012-11-15 17:20:58 -08:00

cyclades.c

tty: remove use of __devexit

2012-11-21 15:27:46 -08:00

ehv_bytechan.c

tty: remove use of __devinit

2012-11-21 15:22:52 -08:00

isicom.c

tty: remove use of __devexit

2012-11-21 15:27:46 -08:00

Kconfig

Merge branch 'for-upstream' of http://github.com/agraf/linux-2.6 into queue

2012-10-10 19:03:54 -03:00

Makefile

…

moxa.c

tty: remove use of __devexit

2012-11-21 15:27:46 -08:00

moxa.h

…

mxser.c

tty: remove use of __devexit

2012-11-21 15:27:46 -08:00

mxser.h

…

n_gsm.c

TTY: n_gsm, use kref from tty_port

2012-11-15 17:20:57 -08:00

n_hdlc.c

…

n_r3964.c

tty: localise the lock

2012-08-10 12:55:47 -07:00

n_tracerouter.c

…

n_tracesink.c

…

n_tracesink.h

…

n_tty.c

tty: add missing newlines to WARN_RATELIMIT

2012-10-25 11:30:27 -07:00

nozomi.c

tty: remove use of __devexit

2012-11-21 15:27:46 -08:00

pty.c

pty: return EINVAL for TIOCGPTN for BSD ptys

2013-01-17 13:56:57 -08:00

rocket_int.h

…

rocket.c

tty: remove use of __devinitdata

2012-11-21 15:25:06 -08:00

rocket.h

…

synclink_gt.c

tty: remove use of __devexit

2012-11-21 15:27:46 -08:00

synclink.c

tty: remove use of __devexit

2012-11-21 15:27:46 -08:00

synclinkmp.c

tty: remove use of __devexit

2012-11-21 15:27:46 -08:00

sysrq.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

2013-02-20 11:00:43 -08:00

tty_audit.c

TTY: audit, stop accessing tty->icount

2012-10-22 16:50:54 -07:00

tty_buffer.c

tty: add missing newlines to WARN_RATELIMIT

2012-10-25 11:30:27 -07:00

tty_io.c

tty: Mark tty_del_file and __tty_hangup static

2012-11-21 15:19:52 -08:00

tty_ioctl.c

tty: pty - Move TIOCPKT handling into pty.c

2012-10-25 12:07:18 -07:00

tty_ldisc.c

tty: Use raw spin lock to protect TTY ldisc administration

2012-10-24 11:37:02 -07:00

tty_mutex.c

tty: tty_mutex.c: Fixed coding style warning (using printk)

2012-10-24 11:34:51 -07:00

tty_port.c

TTY: introduce tty_port_destroy

2012-11-15 17:20:58 -08:00