linux/arch/sh
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
..
boards sh: fix MSIOF0 SPI on ecovec: it conflicts with VOU 2011-01-18 13:53:52 +09:00
boot sh: support XZ-compressed kernel. 2011-01-14 15:52:54 +09:00
cchips sh: hd64461: irq_data conversion. 2010-10-27 15:18:15 +09:00
configs Merge branch 'sh/alphaproject' into sh-latest 2011-01-13 18:38:28 +09:00
drivers Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest 2011-01-11 13:05:15 +09:00
include Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-03-16 15:11:04 -07:00
kernel Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu 2011-03-16 08:22:41 -07:00
lib sh: Ensure ST40-300 BogoMIPS value is consistent 2011-02-15 16:24:05 +09:00
lib64
math-emu sh: wire up perf alignment and emulation faults. 2010-10-13 06:55:26 +09:00
mm sh: Flush executable pages in copy_user_highpage 2011-02-15 16:24:31 +09:00
oprofile sh: oprofile: Make sure the backtrace op is available for timer-fallback. 2010-10-27 17:03:50 +09:00
tools sh: Add support for AP-SH4AD-0A board. 2011-01-13 18:36:21 +09:00
Kconfig Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 2011-01-26 09:00:17 +10:00
Kconfig.cpu sh: Turn on speculative return for SH7785 and SH7786 2010-02-18 18:54:18 +09:00
Kconfig.debug sh: Remove old early serial console code V2 2009-12-15 12:07:35 +09:00
Makefile sh: support XZ-compressed kernel. 2011-01-14 15:52:54 +09:00