tree c2556657873d9c4d50a107727dbf0b30ff1be6ec
parent 65c61bc5dbbcfa1ff38e58aa834cb9a88e84a886
parent 02cc2ccfe771677db3cd40a71837e1467ebc839a
author Linus Torvalds <torvalds@linux-foundation.org> 1441927147 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1441927147 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel

Pull hexagon updates from Richard Kuo:
 "Just two fixes -- one for a uapi header and one for a timer interface"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel:
  Revert "Hexagon: fix signal.c compile error"
  hexagon/time: Migrate to new 'set-state' interface