tree 96e42d5eca385746ea6791807c93933952dc1c3e
parent 56f1f4b24e8787d7ba794dbe2e949d504c054892
parent a34fe10750ebe524a39f97bd78ab4d232a554edb
author Linus Torvalds <torvalds@linux-foundation.org> 1395707818 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1395707818 -0700

Merge branch 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc updates from Helge Deller:
 - revert parts of the latest patch regarding font selection with STICON
   console
 - wire up the utimes() syscall for parisc
 - remove the unused parisc tmpalias code and unnecessary arch*relax
   defines

* 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: locks: remove redundant arch_*_relax operations
  parisc: wire up sys_utimes
  parisc: Remove unused CONFIG_PARISC_TMPALIAS code
  partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in ROM fonts