Linus Torvalds 63a93699c6 Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm ...

* 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6629/2: aaec2000: remove support for mach-aaec2000
  ARM: lh7a40x: remove unmaintained platform support

Fix up trivial conflicts in
 - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed)
 - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)

2011-03-16 19:05:40 -07:00

..

hvc

Merge 2.6.38-rc6 into tty-next

2011-02-24 11:36:31 -08:00

ipwireless

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

2011-03-16 15:11:04 -07:00

serial

Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm

2011-03-16 19:05:40 -07:00

vt

Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2011-03-16 17:21:00 -07:00

amiserial.c

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

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

bfin_jtag_comm.c

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

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

cyclades.c

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

2011-02-22 16:14:56 -08: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

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

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

Makefile

tty: move ipwireless driver from drivers/char/pcmcia/ to drivers/tty/

2011-02-22 16:23:22 -08:00

moxa.c

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

2011-02-22 16:14:56 -08: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

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

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

mxser.h

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

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

n_gsm.c

n_gsm: fix UIH control byte : P bit should be 0

2011-03-09 15:43:39 -08:00

n_hdlc.c

drivers: remove extraneous includes of smp_lock.h

2011-03-02 00:02:40 +01:00

n_r3964.c

drivers: remove extraneous includes of smp_lock.h

2011-03-02 00:02:40 +01:00

n_tty.c

…

nozomi.c

nozomi: don't use flush_scheduled_work()

2011-02-25 11:56:10 -08:00

pty.c

Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2011-03-16 17:21:00 -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

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

2011-02-22 16:14:56 -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

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

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

synclink.c

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

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

synclinkmp.c

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

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

sysrq.c

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

2011-02-15 09:40:27 -08: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_io.c

Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2011-03-16 17:21:00 -07:00

tty_ioctl.c

tty: add a helper for setting termios data from kernel side

2011-02-17 12:03:52 -08:00

tty_ldisc.c

Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2011-03-16 17:21:00 -07:00

tty_mutex.c

…

tty_port.c

…