Olof Johansson
e3a66aa33a
Merge branch 'multiplatform/platform-data' into next/multiplatform
* multiplatform/platform-data:
ARM: spear: move platform_data definitions
ARM: samsung: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: nomadik: move platform_data definitions
ARM: w90x900: move platform_data definitions
ARM: vt8500: move platform_data definitions
ARM: tegra: move sdhci platform_data definition
ARM: sa1100: move platform_data definitions
ARM: pxa: move platform_data definitions
ARM: netx: move platform_data definitions
ARM: msm: move platform_data definitions
ARM: imx: move platform_data definitions
ARM: ep93xx: move platform_data definitions
ARM: davinci: move platform_data definitions
ARM: at91: move platform_data definitions
Conflicts due to removed files:
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-trimslice.c
Conflicts due to code removal:
arch/arm/mach-tegra/board-paz00.c
Context conflicts in:
drivers/mmc/host/sdhci-tegra.c
drivers/net/irda/pxaficp_ir.c
Signed-off-by: Olof Johansson <olof@lixom.net>
|
2012-09-22 01:07:21 -07:00 |
| .. |
|
hvc
|
TTY: hvcs, add tty install
|
2012-08-13 16:53:14 -07:00 |
|
ipwireless
|
TTY: use tty_port_register_device
|
2012-08-13 16:50:19 -07:00 |
|
serial
|
Merge branch 'multiplatform/platform-data' into next/multiplatform
|
2012-09-22 01:07:21 -07:00 |
|
vt
|
tty vt: Fix line garbage in virtual console on command line edition
|
2012-09-10 16:35:46 -07:00 |
|
amiserial.c
|
serial: add a new helper function
|
2012-09-05 13:28:35 -07:00 |
|
bfin_jtag_comm.c
|
TTY: use tty_port_link_device
|
2012-08-13 16:50:19 -07:00 |
|
cyclades.c
|
serial: add a new helper function
|
2012-09-05 13:28:35 -07:00 |
|
ehv_bytechan.c
|
TTY: use tty_port_register_device
|
2012-08-13 16:50:19 -07:00 |
|
isicom.c
|
serial: add a new helper function
|
2012-09-05 13:28:35 -07:00 |
|
Kconfig
|
|
|
|
Makefile
|
|
|
|
moxa.c
|
TTY: tty_alloc_driver() returns error pointers
|
2012-08-16 12:07:23 -07:00 |
|
moxa.h
|
|
|
|
mxser.c
|
serial: add a new helper function
|
2012-09-05 13:28:35 -07:00 |
|
mxser.h
|
|
|
|
n_gsm.c
|
n_gsm: memory leak in uplink error path
|
2012-08-16 12:03:30 -07: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
|
Remove BUG_ON from n_tty_read()
|
2012-08-16 11:53:14 -07:00 |
|
nozomi.c
|
TTY: use tty_port_register_device
|
2012-08-13 16:50:19 -07:00 |
|
pty.c
|
TTY: tty_alloc_driver() returns error pointers
|
2012-08-16 12:07:23 -07:00 |
|
rocket.c
|
TTY: use tty_port_register_device
|
2012-08-13 16:50:19 -07:00 |
|
rocket.h
|
|
|
|
rocket_int.h
|
|
|
|
synclink.c
|
serial: add a new helper function
|
2012-09-05 13:28:35 -07:00 |
|
synclink_gt.c
|
serial: add a new helper function
|
2012-09-05 13:28:35 -07:00 |
|
synclinkmp.c
|
serial: add a new helper function
|
2012-09-05 13:28:35 -07:00 |
|
sysrq.c
|
|
|
|
tty_audit.c
|
|
|
|
tty_buffer.c
|
tty: hold lock across tty buffer finding and buffer filling
|
2012-04-09 12:12:45 -07:00 |
|
tty_io.c
|
tty_register_device_attr updated for tty-next
|
2012-09-06 14:40:18 -07:00 |
|
tty_ioctl.c
|
tty: Fix up PPC fallout from the termios move
|
2012-07-17 09:10:55 -07:00 |
|
tty_ldisc.c
|
tty: localise the lock
|
2012-08-10 12:55:47 -07:00 |
|
tty_mutex.c
|
tty: localise the lock
|
2012-08-10 12:55:47 -07:00 |
|
tty_port.c
|
tty_register_device_attr updated for tty-next
|
2012-09-06 14:40:18 -07:00 |