mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 20:32:22 +00:00
3498d13b80
As we skipped the merge window for 3.6-rc1 for the tty tree, everything
is now settled down and working properly, so we are ready for 3.7-rc1.
Here's the patchset, it's big, but the large changes are removing a
firmware file and adding a staging tty driver (it depended on the tty
core changes, so it's going through this tree instead of the staging
tree.)
All of these patches have been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlBp36oACgkQMUfUDdst+yk4WgCdEy13hot8fI2Lqnc7W0LKu7GX
4p8AoLTjzrXhLosxdijskDQ9X1OtjrxU
=S5Ng
-----END PGP SIGNATURE-----
Merge tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY changes from Greg Kroah-Hartman:
"As we skipped the merge window for 3.6-rc1 for the tty tree,
everything is now settled down and working properly, so we are ready
for 3.7-rc1. Here's the patchset, it's big, but the large changes are
removing a firmware file and adding a staging tty driver (it depended
on the tty core changes, so it's going through this tree instead of
the staging tree.)
All of these patches have been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fix up more-or-less trivial conflicts in
- drivers/char/pcmcia/synclink_cs.c:
tty NULL dereference fix vs tty_port_cts_enabled() helper function
- drivers/staging/{Kconfig,Makefile}:
add-add conflict (dgrp driver added close to other staging drivers)
- drivers/staging/ipack/devices/ipoctal.c:
"split ipoctal_channel from iopctal" vs "TTY: use tty_port_register_device"
* tag 'tty-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (235 commits)
tty/serial: Add kgdb_nmi driver
tty/serial/amba-pl011: Quiesce interrupts in poll_get_char
tty/serial/amba-pl011: Implement poll_init callback
tty/serial/core: Introduce poll_init callback
kdb: Turn KGDB_KDB=n stubs into static inlines
kdb: Implement disable_nmi command
kernel/debug: Mask KGDB NMI upon entry
serial: pl011: handle corruption at high clock speeds
serial: sccnxp: Make 'default' choice in switch last
serial: sccnxp: Remove mask termios caps for SW flow control
serial: sccnxp: Report actual baudrate back to core
serial: samsung: Add poll_get_char & poll_put_char
Powerpc 8xx CPM_UART setting MAXIDL register proportionaly to baud rate
Powerpc 8xx CPM_UART maxidl should not depend on fifo size
Powerpc 8xx CPM_UART too many interrupts
Powerpc 8xx CPM_UART desynchronisation
serial: set correct baud_base for EXSYS EX-41092 Dual 16950
serial: omap: fix the reciever line error case
8250: blacklist Winbond CIR port
8250_pnp: do pnp probe before legacy probe
...
67 lines
2.3 KiB
Makefile
67 lines
2.3 KiB
Makefile
# Makefile for staging directory
|
|
|
|
# fix for build system bug...
|
|
obj-$(CONFIG_STAGING) += staging.o
|
|
|
|
obj-y += media/
|
|
obj-y += net/
|
|
obj-$(CONFIG_ET131X) += et131x/
|
|
obj-$(CONFIG_SLICOSS) += slicoss/
|
|
obj-$(CONFIG_USBIP_CORE) += usbip/
|
|
obj-$(CONFIG_W35UND) += winbond/
|
|
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
|
|
obj-$(CONFIG_ECHO) += echo/
|
|
obj-$(CONFIG_COMEDI) += comedi/
|
|
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
|
|
obj-$(CONFIG_ASUS_OLED) += asus_oled/
|
|
obj-$(CONFIG_PANEL) += panel/
|
|
obj-$(CONFIG_R8187SE) += rtl8187se/
|
|
obj-$(CONFIG_RTL8192U) += rtl8192u/
|
|
obj-$(CONFIG_RTL8192E) += rtl8192e/
|
|
obj-$(CONFIG_R8712U) += rtl8712/
|
|
obj-$(CONFIG_RTS_PSTOR) += rts_pstor/
|
|
obj-$(CONFIG_RTS5139) += rts5139/
|
|
obj-$(CONFIG_TRANZPORT) += frontier/
|
|
obj-$(CONFIG_IDE_PHISON) += phison/
|
|
obj-$(CONFIG_LINE6_USB) += line6/
|
|
obj-$(CONFIG_USB_SERIAL_QUATECH2) += serqt_usb2/
|
|
obj-$(CONFIG_OCTEON_ETHERNET) += octeon/
|
|
obj-$(CONFIG_VT6655) += vt6655/
|
|
obj-$(CONFIG_VT6656) += vt6656/
|
|
obj-$(CONFIG_VME_BUS) += vme/
|
|
obj-$(CONFIG_IPACK_BUS) += ipack/
|
|
obj-$(CONFIG_DX_SEP) += sep/
|
|
obj-$(CONFIG_IIO) += iio/
|
|
obj-$(CONFIG_ZRAM) += zram/
|
|
obj-$(CONFIG_ZCACHE) += zcache/
|
|
obj-$(CONFIG_ZSMALLOC) += zsmalloc/
|
|
obj-$(CONFIG_WLAGS49_H2) += wlags49_h2/
|
|
obj-$(CONFIG_WLAGS49_H25) += wlags49_h25/
|
|
obj-$(CONFIG_FB_SM7XX) += sm7xxfb/
|
|
obj-$(CONFIG_CRYSTALHD) += crystalhd/
|
|
obj-$(CONFIG_CXT1E1) += cxt1e1/
|
|
obj-$(CONFIG_FB_XGI) += xgifb/
|
|
obj-$(CONFIG_TIDSPBRIDGE) += tidspbridge/
|
|
obj-$(CONFIG_ACPI_QUICKSTART) += quickstart/
|
|
obj-$(CONFIG_SBE_2T3E3) += sbe-2t3e3/
|
|
obj-$(CONFIG_USB_ENESTORAGE) += keucr/
|
|
obj-$(CONFIG_BCM_WIMAX) += bcm/
|
|
obj-$(CONFIG_FT1000) += ft1000/
|
|
obj-$(CONFIG_SPEAKUP) += speakup/
|
|
obj-$(CONFIG_TOUCHSCREEN_CLEARPAD_TM1217) += cptm1217/
|
|
obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += ste_rmi4/
|
|
obj-$(CONFIG_MFD_NVEC) += nvec/
|
|
obj-$(CONFIG_DRM_OMAP) += omapdrm/
|
|
obj-$(CONFIG_ANDROID) += android/
|
|
obj-$(CONFIG_PHONE) += telephony/
|
|
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/
|
|
obj-$(CONFIG_USB_G_CCG) += ccg/
|
|
obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/
|
|
obj-$(CONFIG_CSR_WIFI) += csr/
|
|
obj-$(CONFIG_OMAP_BANDGAP) += omap-thermal/
|
|
obj-$(CONFIG_ZCACHE2) += ramster/
|
|
obj-$(CONFIG_NET_VENDOR_SILICOM) += silicom/
|
|
obj-$(CONFIG_CED1401) += ced1401/
|
|
obj-$(CONFIG_DRM_IMX) += imx-drm/
|
|
obj-$(CONFIG_DGRP) += dgrp/
|