From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Apr 2014 18:22:45 +0000 (-0700)
Subject: Merge tag 'please-pull-ia64-erratum' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.15-rc2~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7d38cc02909b85f6f4d3f082c471f0151fc5be3e;p=karo-tx-linux.git

Merge tag 'please-pull-ia64-erratum' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull itanium erratum fix from Tony Luck:
 "Small workaround for a rare, but annoying, erratum #237"

* tag 'please-pull-ia64-erratum' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Change default PSR.ac from '1' to '0' (Fix erratum #237)
---

7d38cc02909b85f6f4d3f082c471f0151fc5be3e