From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Mar 2014 00:36:58 +0000 (-0700)
Subject: Merge branch 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: firefly_0821_release~176^2~4260
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=822316461b15e0207e50ff661f9cf830af116e9f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'parisc-3.14' of git://git./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
---

822316461b15e0207e50ff661f9cf830af116e9f