OpenCloudOS-Kernel/arch/m68k
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
..
amiga m68k/amiga: Fix "debug=mem" 2011-01-23 11:24:42 +01:00
apollo m68k: apollo core - Kill warn_unused_result warnings 2009-01-12 20:56:35 +01:00
atari m68k/atari: Rename "scc" to "atari_scc" 2011-01-23 11:24:35 +01:00
bvme6000 m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
configs defconfig reduction 2010-08-14 22:26:53 +02:00
fpsp040 m68k: fix trigraph ignored warning in setox.S 2008-12-28 20:00:05 +01:00
hp300 m68k: hp300 - Checkpatch cleanup 2010-05-17 21:15:40 +02:00
ifpsp060 m68k: fix comment typo diable -> disable. 2011-01-03 16:06:58 +01:00
include/asm m68knommu: add optimize memmove() function 2011-02-16 09:43:16 +10:00
kernel m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
lib m68k: remove arch specific non-optimized memcmp() 2011-02-16 09:42:24 +10:00
mac fix comment typos concerning "consistent" 2010-12-10 16:04:28 +01:00
math-emu locking, m68k/asm-offsets: Rename signal defines 2009-09-01 09:38:03 +02:00
mm m68k: invoke oom-killer from page fault 2010-05-17 21:37:39 +02:00
mvme16x m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
mvme147 m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
q40 Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
sun3 m68k: Switch do_timer() to xtime_update() 2011-01-31 14:55:46 +01:00
sun3x include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
tools/amiga Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
Kconfig tty: move obsolete and broken tty drivers to drivers/staging/tty/ 2011-02-22 16:57:21 -08:00
Kconfig.debug Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line 2010-08-03 14:09:45 +02:00
install.sh kbuild: use INSTALLKERNEL to select customized installkernel script 2009-09-20 12:18:14 +02:00