2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
linux-next/arch/arm/plat-s5p
Linus Torvalds efb8d21b2c Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits)
  TTY: serial_core: Fix crash if DCD drop during suspend
  tty/serial: atmel_serial: bootconsole removed from auto-enumerates
  Revert "TTY: call tty_driver_lookup_tty unconditionally"
  tty/serial: atmel_serial: add device tree support
  tty/serial: atmel_serial: auto-enumerate ports
  tty/serial: atmel_serial: whitespace and braces modifications
  tty/serial: atmel_serial: change platform_data variable name
  tty/serial: RS485 bindings for device tree
  TTY: call tty_driver_lookup_tty unconditionally
  TTY: pty, release tty in all ptmx_open fail paths
  TTY: make tty_add_file non-failing
  TTY: drop driver reference in tty_open fail path
  8250_pci: Fix kernel panic when pch_uart is disabled
  h8300: drivers/serial/Kconfig was moved
  parport_pc: release IO region properly if unsupported ITE887x card is found
  tty: Support compat_ioctl get/set termios_locked
  hvc_console: display printk messages on console.
  TTY: snyclinkmp: forever loop in tx_load_dma_buffer()
  tty/n_gsm: avoid fifo overflow in gsm_dlci_data_output
  tty/n_gsm: fix a bug in gsm_dlci_data_output (adaption = 2 case)
  ...

Fix up Conflicts in:
 - drivers/tty/serial/8250_pci.c
	Trivial conflict with removed duplicate device ID
 - drivers/tty/serial/atmel_serial.c
	Annoying silly conflict between "specify the port num via
	platform_data" and other changes to atmel_console_init
2011-10-26 15:11:09 +02:00
..
include/plat ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
clock.c ARM: S5P: fix bug in spdif_clk_get_rate 2011-08-19 21:21:08 +09:00
cpu.c ARM: S5P6442: Removing ARCH_S5P6442 2011-05-12 08:10:53 +09:00
dev-csis0.c ARM: S5P: Rename MIPI-CSIS driver header and update Copyright 2011-03-11 15:49:00 +09:00
dev-csis1.c ARM: S5P: Rename MIPI-CSIS driver header and update Copyright 2011-03-11 15:49:00 +09:00
dev-ehci.c ARM: EXYNOS4: Add usb host phy control 2011-04-13 16:50:44 -07:00
dev-fimc0.c ARM: S5P: Decrease IO Registers memory region size on FIMC 2010-09-14 17:57:55 +09:00
dev-fimc1.c ARM: S5P: Decrease IO Registers memory region size on FIMC 2010-09-14 17:57:55 +09:00
dev-fimc2.c ARM: S5P: Decrease IO Registers memory region size on FIMC 2010-09-14 17:57:55 +09:00
dev-fimc3.c ARM: S5P: Add platform definitions for FIMC3 2011-03-12 08:58:01 +09:00
dev-fimd0.c ARM: EXYNOS4: Add platform device and helper functions for FIMD 2011-07-21 17:28:51 +09:00
dev-mfc.c ARM: S5P: Add support for MFC device 2011-07-21 17:29:00 +09:00
dev-onenand.c ARM: SAMSUNG: Remove unused onenand plat functions 2011-06-03 16:45:02 -07:00
dev-pmu.c ARM: S5P: Add PMU device 2010-08-05 18:30:21 +09:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
irq-eint.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq-gpioint.c ARM: S5P: fix offset calculation on gpio-interrupt 2011-10-21 18:05:02 +09:00
irq-pm.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
irq.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
Kconfig ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
Makefile ARM: S5P: Add support for MFC device 2011-07-21 17:29:00 +09:00
pm.c ARM: S5P: Remove unused s3c_pm_check_resume_pin 2011-04-14 13:19:40 +09:00
s5p-time.c Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel 2011-07-21 17:28:23 +09:00
setup-mipiphy.c ARM: S5P: Add support for common MIPI CSIS/DSIM D-PHY control 2011-03-11 15:49:01 +09:00
sysmmu.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00