original_kernel/arch/arm/plat-samsung
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 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 2011-10-26 15:11:09 +02:00
Kconfig ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
Makefile ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
adc.c
clock-clksrc.c
clock.c ARM: SAMSUNG: fix watchdog reset issue with clk_get() 2011-09-15 13:59:58 +09:00
dev-adc.c
dev-asocdma.c
dev-backlight.c
dev-fb.c
dev-hsmmc.c
dev-hsmmc1.c
dev-hsmmc2.c
dev-hsmmc3.c
dev-hwmon.c
dev-i2c0.c
dev-i2c1.c
dev-i2c2.c
dev-i2c3.c
dev-i2c4.c
dev-i2c5.c
dev-i2c6.c
dev-i2c7.c
dev-ide.c
dev-keypad.c
dev-nand.c
dev-onenand.c
dev-pwm.c
dev-rtc.c
dev-ts.c
dev-uart.c
dev-usb-hsotg.c
dev-usb.c
dev-wdt.c
dma.c
gpio-config.c
gpio.c
init.c
irq-vic-timer.c ARM: SAMSUNG: Add chained enrty/exit call to timer interrupt handler 2011-08-19 20:57:37 +09:00
pd.c
platformdata.c
pm-check.c
pm-gpio.c
pm.c Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:41:04 -07:00
pwm-clock.c
pwm.c
s3c-pl330.c
time.c
wakeup-mask.c