korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 18:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
efb8d21b2c
linux/arch/arm
History
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
..
boot Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
common Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
configs ARM: 7102/1: mach-integrator: update defconfig 2011-10-17 09:13:40 +01:00
include/asm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-10-25 12:11:02 +02:00
kernel Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
lib Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-at91 ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-bcmring Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-10-25 12:11:02 +02:00
mach-clps711x ARM: platform fixups: remove mdesc argument to fixup function 2011-10-17 09:13:41 +01:00
mach-cns3xxx Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-davinci Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-dove Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-ebsa110 Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-ep93xx ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-exynos4 Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-footbridge Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-gemini ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-h720x ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-imx ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-integrator Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-iop13xx ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-iop32x ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-iop33x ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-ixp4xx Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-ixp23xx ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-ixp2000 ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-kirkwood ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-ks8695 ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-l7200/include/mach
mach-lpc32xx ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-mmp Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 2011-10-25 12:23:15 +02:00
mach-msm Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 2011-10-25 15:18:39 +02:00
mach-mv78xx0 ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-mx5 ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-mxs ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-netx ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-nomadik ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-nuc93x Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-10-25 12:11:02 +02:00
mach-omap1 Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 2011-10-25 15:18:39 +02:00
mach-omap2 Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 2011-10-25 12:23:15 +02:00
mach-orion5x ARM: platform fixups: remove mdesc argument to fixup function 2011-10-17 09:13:41 +01:00
mach-pnx4008 ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-prima2 Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-pxa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-10-25 12:11:02 +02:00
mach-realview Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-rpc Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-s3c64xx Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 2011-10-26 15:11:09 +02:00
mach-s3c2400/include/mach ARM: mach-s3c2400: delete 2011-07-18 10:59:26 -04:00
mach-s3c2410 Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-s3c2412 Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-s3c2416 ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM 2011-10-22 04:00:53 +09:00
mach-s3c2440 ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM 2011-10-22 04:00:53 +09:00
mach-s3c2443 ARM: S3C2443: Fix bit-reset in setrate of clk_armdiv 2011-09-26 10:30:29 +09:00
mach-s5p64x0 ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-s5pc100 ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-s5pv210 Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-sa1100 Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-shark ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-shmobile Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 2011-10-25 15:18:39 +02:00
mach-spear3xx ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-spear6xx ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-tcc8k ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-tegra Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-u300 Merge branch 'for-next' of git://git.linaro.org/people/triad/linux-pinctrl 2011-10-25 14:04:01 +02:00
mach-ux500 Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-versatile ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mach-vexpress Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-vt8500 Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
mach-w90x900 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-10-25 12:11:02 +02:00
mach-zynq ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mm Merge branch 'misc' into for-linus 2011-10-25 08:19:59 +01:00
nwfpe
oprofile
plat-iop ARM: convert PCI defines to variables 2011-07-12 11:19:29 -05:00
plat-mxc Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2011-10-25 12:13:59 +02:00
plat-nomadik net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
plat-omap Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus 2011-10-25 08:19:29 +01:00
plat-orion genirq: replace irq_gc_ack() with {set,clr}_bit variants (fwd) 2011-07-07 16:02:26 +00:00
plat-pxa mmc: sdhci-pxa: move platform data to include/linux/platform_data 2011-07-20 17:20:52 -04:00
plat-s3c24xx Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 12:43:28 -07:00
plat-s5p Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 2011-10-26 15:11:09 +02:00
plat-samsung Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 2011-10-26 15:11:09 +02:00
plat-spear Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-26 17:12:10 -07:00
plat-tcc ARM: Consolidate the clkdev header files 2011-07-19 18:09:45 +02:00
plat-versatile
tools ARM: Add a few machine types to mach-types 2011-10-17 13:28:46 +01:00
vfp ARM: vfp: use -mfloat-abi=soft to build vfp 2011-10-01 21:08:55 +02:00
Kconfig 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-nommu
Kconfig.debug Merge branches 'arnd-randcfg-fixes', 'debug', 'io' (early part), 'l2x0', 'p2v', 'pgt' (early part) and 'smp' into for-linus 2011-10-25 08:19:29 +01:00
Makefile ARM: 7012/1: Set proper TEXT_OFFSET for newer MSMs 2011-08-13 11:26:18 +01:00