• Linus Torvalds's avatar
    Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6 · 4d3ce21f
    Linus Torvalds authored
    * master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (23 commits)
      [PARISC] Move os_id_to_string() inside #ifndef __ASSEMBLY__
      [PARISC] Fix do_gettimeofday() hang
      [PARISC] Fix PCREL22F relocation problem for most modules
      [PARISC] Refactor show_regs in traps.c
      [PARISC] Add os_id_to_string helper
      [PARISC] OS_ID_LINUX == 0x0006
      [PARISC] Ensure Space ID hashing is turned off
      [PARISC] Match show_cache_info with reality
      [PARISC] Remove unused macro fixup_branch in syscall.S
      [PARISC] Add is_compat_task() helper
      [PARISC] Update Thibaut Varene's CREDITS entry
      [PARISC] Reduce data footprint in pdc_stable.c
      [PARISC] pdc_stable version 0.30
      [PARISC] Work around machines which do not support chassis warnings
      [PARISC] PDC_CHASSIS is implemented on all machines
      [PARISC] Remove unconditional #define PIC in syscall macros
      [PARISC] Use MFIA in current_text_addr on pa2.0 processors
      [PARISC] Remove dead function pc_in_user_space
      [PARISC] Test ioc_needs_fdc variable instead of open coding
      [PARISC] Fix gcc 4.1 warnings in sba_iommu.c