Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
e6bee325e4
linux/drivers/staging
History
Linus Torvalds e6bee325e4 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
  pch_uart: reference clock on CM-iTC
  pch_phub: add new device ML7213
  n_gsm: fix UIH control byte : P bit should be 0
  n_gsm: add a documentation
  serial: msm_serial_hs: Add MSM high speed UART driver
  tty_audit: fix tty_audit_add_data live lock on audit disabled
  tty: move cd1865.h to drivers/staging/tty/
  Staging: tty: fix build with epca.c driver
  pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
  Staging: generic_serial: fix double locking bug
  nozomi: don't use flush_scheduled_work()
  tty/serial: Relax the device_type restriction from of_serial
  MAINTAINERS: Update HVC file patterns
  tty: phase out of ioctl file pointer for tty3270 as well
  tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
  pch_uart: Fix DMA channel miss-setting issue.
  pch_uart: fix exclusive access issue
  pch_uart: fix auto flow control miss-setting issue
  pch_uart: fix uart clock setting issue
  pch_uart : Use dev_xxx not pr_xxx
  ...

Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
2011-03-16 15:11:04 -07:00
..
asus_oled Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ath6kl Staging: ath6kl: fix potential buffer overflow 2011-01-20 12:01:23 -08:00
autofs Add a dentry op to allow processes to be held during pathwalk transit 2011-01-15 20:07:31 -05:00
bcm staging: fix build failure in bcm driver 2011-01-17 17:39:39 -08:00
brcm80211 staging: brcm80211: bugfix for softmac crash on multi cpu configurations 2011-02-02 15:06:15 -08:00
comedi Staging: Comedi: Fix a few NI module dependencies 2011-02-09 11:39:50 -08:00
cptm1217 staging: clearpad_tm1217 depends on INPUT 2010-11-19 17:17:45 -08:00
crystalhd drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
cs5535_gpio cs5535: deprecate older cs5535_gpio driver 2011-01-13 08:03:13 -08:00
cx25821 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
cxt1e1 Staging: cxt1e1: rename global log_level variable 2010-12-10 10:46:30 -08:00
dabusb [media] dabusb: Move it to staging to be deprecated 2010-12-29 08:17:15 -02:00
dt3155v4l [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
easycap Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
echo
et131x drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
frontier Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ft1000 staging: ft1000: Fix kernel panic when use ioctl. 2010-12-16 12:20:05 -08:00
generic_serial Staging: generic_serial: fix double locking bug 2011-02-28 13:21:20 -08:00
go7007 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
hv staging: hv: Enable sending GARP packet after live migration 2011-02-02 15:06:14 -08:00
iio Staging: iio: Aditional fixpoint formatted output bugfix 2011-01-22 06:32:21 -08:00
intel_sst staging: sst: Fix for dmic capture on v2 pmic 2011-02-02 15:06:14 -08:00
keucr Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
line6 staging/line6: Fix sparse warning 'Using plain integer as NULL pointer' 2010-12-08 14:31:01 -08:00
lirc [media] lirc_zilog: z8 on usb doesn't like back-to-back i2c_master_send 2011-01-31 12:18:42 -02:00
memrar Staging: sep: handle the memrar stuff in the headers 2010-11-29 11:17:27 -08:00
msm console: rename acquire/release_console_sem() to console_lock/unlock() 2011-01-26 10:50:06 +10:00
octeon Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
olpc_dcon console: rename acquire/release_console_sem() to console_lock/unlock() 2011-01-26 10:50:06 +10:00
panel llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
phison Staging: phison: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:48 -08:00
pohmelfs pohmelfs: double-free and leak 2011-01-12 20:02:44 -05:00
quatech_usb2 tty: remove filp from the USB tty ioctls 2011-02-17 11:59:14 -08:00
quickstart Staging: quickstart: free after input_unregister_device() 2010-11-16 12:25:52 -08:00
rt2860 staging: rt2860: Fix incorrect netif_stop_queue usage warning 2011-01-20 12:06:06 -08:00
rt2870 Staging: rt2870: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:46 -07:00
rtl8187se staging: rtl8187se: Change panic to warn when RF switch turned off 2010-11-16 12:25:53 -08:00
rtl8192e Staging: rtl8192e: use DEFINE_PCI_DEVICE_TABLE 2010-12-09 16:29:48 -08:00
rtl8192u Staging: rtl8192u: add missing curly braces 2010-12-10 10:39:55 -08:00
rtl8712 staging: r8712u: Add new device IDs 2011-01-25 04:53:59 +08:00
samsung-laptop Merge branch 'master' into for-next 2010-12-22 18:57:02 +01:00
sbe-2t3e3 Staging: sbe-2t3e3: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
se401 [media] staging: se401 depends on USB 2010-12-30 22:29:41 -02:00
sep staging: sep: fix comments in sep_get_static_pool_addr_handler 2010-12-10 10:39:55 -08:00
serqt_usb2 tty: remove filp from the USB tty ioctls 2011-02-17 11:59:14 -08:00
slicoss
sm7xx console: rename acquire/release_console_sem() to console_lock/unlock() 2011-01-26 10:50:06 +10:00
smbfs staging: smbfs building fix 2011-01-17 01:50:52 -05:00
solo6x10 staging: solo6010 depends on I2C 2010-12-09 16:29:49 -08:00
speakup Staging: speakup: &&/|| confusion in silent_store() 2011-01-20 12:06:07 -08:00
spectra Staging: Merge 2.6.37-rc5 into staging-next 2010-12-07 10:47:56 -08:00
ste_rmi4 Staging: ste_rmi4: use after input_unregister_device() 2011-01-20 12:01:23 -08:00
ti-st
tidspbridge staging: tidspbridge: replace mbox callback with notifier_call 2011-01-20 12:19:47 -08:00
tm6000 [media] tm6000: rework init code 2011-01-19 11:45:58 -02:00
tty tty: move cd1865.h to drivers/staging/tty/ 2011-03-07 12:04:50 -08:00
usbip USB 3.0 Hub Changes 2011-03-13 18:07:11 -07:00
usbvideo [media] staging: usbvideo/vicam depends on USB 2010-12-30 22:29:39 -02:00
vme Delete zero-length drivers/staging/vme/bridges/Module.symvers 2011-01-28 03:23:42 -05:00
vt6655 drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
vt6656 drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
westbridge Staging: Merge 2.6.37-rc2 into staging-next 2010-11-16 10:44:50 -08:00
winbond Staging: w35und: Kill struct wb_usb 2010-12-01 14:45:47 -08:00
wlags49_h2 drivers/staging: Remove unnecessary casts of pci_get_drvdata 2010-11-16 12:06:47 -08:00
wlags49_h25
wlan-ng Staging: Merge 2.6.37-rc2 into staging-next 2010-11-16 10:44:50 -08:00
xgifb Staging: xgfib: put parenthesis in the right place 2011-01-20 12:01:23 -08:00
zram staging: zram: fix data corruption issue 2011-02-09 11:39:51 -08:00
Kconfig tty: move obsolete and broken generic_serial drivers to drivers/staging/generic_serial/ 2011-02-22 17:09:33 -08:00
Makefile tty: move obsolete and broken generic_serial drivers to drivers/staging/generic_serial/ 2011-02-22 17:09:33 -08:00
staging.c