kevin/linux
1
Fork 0
Code
8b6f08eaef
linux/arch/parisc/kernel
History
Linus Torvalds 56b85f32d5 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: (36 commits)
  serial: apbuart: Fixup apbuart_console_init()
  TTY: Add tty ioctl to figure device node of the system console.
  tty: add 'active' sysfs attribute to tty0 and console device
  drivers: serial: apbuart: Handle OF failures gracefully
  Serial: Avoid unbalanced IRQ wake disable during resume
  tty: fix typos/errors in tty_driver.h comments
  pch_uart : fix warnings for 64bit compile
  8250: fix uninitialized FIFOs
  ip2: fix compiler warning on ip2main_pci_tbl
  specialix: fix compiler warning on specialix_pci_tbl
  rocket: fix compiler warning on rocket_pci_ids
  8250: add a UPIO_DWAPB32 for 32 bit accesses
  8250: use container_of() instead of casting
  serial: omap-serial: Add support for kernel debugger
  serial: fix pch_uart kconfig & build
  drivers: char: hvc: add arm JTAG DCC console support
  RS485 documentation: add 16C950 UART description
  serial: ifx6x60: fix memory leak
  serial: ifx6x60: free IRQ on error
  Serial: EG20T: add PCH_UART driver
  ...

Fixed up conflicts in drivers/serial/apbuart.c with evil merge that
makes the code look fairly sane (unlike either side).
2011-01-07 14:39:20 -08:00
..
.gitignore
asm-offsets.c parisc: Use of align_frame provides stack frame. 2010-05-30 05:38:27 -04:00
binfmt_elf32.c
cache.c parisc: remove trailing space in messages 2010-03-06 22:54:09 +00:00
drivers.c
entry.S parisc: Remove unnecessary macros from entry.S 2010-05-30 05:47:28 -04:00
firmware.c parisc: pass through '\t' to early (iodc) console 2010-08-04 11:17:10 -07:00
ftrace.c sched_clock: Add local_clock() API and improve documentation 2010-06-09 10:34:49 +02:00
hardware.c
head.S Rename .data.read_mostly to .data..read_mostly. 2010-03-03 11:26:00 +01:00
hpmc.S
init_task.c Rename .data.vmpages and .data.vm0.XXX to .data..vmpages and .data..vm0.XXX. 2010-03-03 11:26:00 +01:00
inventory.c parisc: inventory.c, fix bloated stack frame 2009-07-03 03:34:11 +00:00
irq.c parisc: convert the rest of the irq handlers to simple/percpu 2010-12-04 11:15:19 -05:00
Makefile
module.c modules: Fix module_bug_list list corruption race 2010-10-05 11:29:27 -07:00
pa7300lc.c
pacache.S
parisc_ksyms.c
pci-dma.c 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
pci.c 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
pdc_chassis.c
pdc_cons.c parisc: cleanup console handling 2010-11-16 12:50:18 -08:00
perf_asm.S
perf_images.h
perf.c parisc: remove big kernel lock 2010-10-16 22:43:08 +02:00
process.c Make do_execve() take a const filename pointer 2010-08-17 18:07:43 -07:00
processor.c parisc: processor.c, fix bloated stack frame 2009-07-03 03:34:11 +00:00
ptrace.c ptrace: cleanup arch_ptrace() on parisc 2010-10-27 18:03:11 -07:00
real2.S
setup.c parisc: remove CVS keywords 2009-07-03 03:34:06 +00:00
signal32.c 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
signal32.h
signal.c parisc: remove redundant initialization in sigsegv path of sys_rt_sigreturn 2010-11-29 20:34:38 -05:00
smp.c 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
stacktrace.c
sys32.h
sys_parisc32.c BKL: remove extraneous #include <smp_lock.h> 2010-11-17 08:59:32 -08:00
sys_parisc.c improve sys_newuname() for compat architectures 2010-03-12 15:52:32 -08:00
syscall_table.S parisc: add prlimit64 syscall 2010-10-13 20:35:56 -04:00
syscall.S parisc: LWS fixes for syscall.S 2010-05-30 05:46:37 -04:00
time.c parisc: Convert to read/update_persistent_clock 2010-03-06 22:54:10 +00:00
topology.c
traps.c parisc: fix warning in traps.c 2009-08-28 19:37:20 -10:00
unaligned.c arch/parisc: Removing undead ifdef CONFIG_PA20 2010-10-21 21:13:29 -04:00
unwind.c parisc: unwind - optimise linked-list searches for modules 2010-10-21 21:12:19 -04:00
vmlinux.lds.S Rename .data.lock_aligned to .data..lock_aligned. 2010-03-03 11:26:01 +01:00