• Linus Torvalds's avatar
    Merge branch 'cris' of git://www.jni.nu/cris · 0cf975e1
    Linus Torvalds authored
    * 'cris' of git://www.jni.nu/cris: (158 commits)
      CRIS v32: Remove hwregs/timer_defs.h, it is now architecture specific.
      CRIS v32: Change drivers/i2c.c locking.
      CRIS v32: Rewrite ARTPEC-3 gpio driver to avoid volatiles and general cleanup.
      CRIS: Add new timerfd syscall entries.
      MAINTAINERS: Add my information for the CRIS port.
      CRIS v32: Correct spelling of bandwidth in function name.
      CRIS v32: Clean up nandflash.c for ARTPEC-3 and ETRAX FS.
      CRIS v10: Cleanup of drivers/gpio.c
      CRIS v10: drivers/net/cris/eth_v10.c rename LED defines to CRIS_LED to avoid name clash.
      CRIS: Make io_pwm_set_period members unsigned in etraxgpio.h
      CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file.
      CRIS: Drop regs parameter from call to profile_tick in kernel/time.c
      CRIS v32: Fix minor formatting issue in mach-a3/io.c
      CRIS v32: Initialize GIO even if we're rambooting in kernel/head.S
      CRIS v32: Remove kernel/arbiter.c, it now exists in machine dependent directory.
      CRIS v32: Minor changes to avoid errors in asm-cris/arch-v32/hwregs/reg_rdwr.h
      CRIS v32: arch-v32/hwregs/intr_vect_defs.h moved to machine dependent directory.
      CRIS v32: Correct offset for TASK_pid in asm-cris/arch-v32/offset.h
      CRIS v32: Move register map header to machine dependent directory.
      CRIS v32: Let compiler know that memory is clobbered after a break op.
      ...
    0cf975e1
MAINTAINERS 94.3 KB