From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 Jun 2013 16:29:19 +0000 (-1000)
Subject: Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~295
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=17858ca65eef148d335ffd4cfc09228a1c1cbfb5;p=firefly-linux-kernel-4.4.55.git

Merge tag 'please-pull-fixia64' of git://git./linux/kernel/git/aegl/linux

Pull ia64 build fix from Tony Luck:
 "Fix ia64 build breakage by adding newly needed #include"

We're still debating the patch that caused the build breakage, but this
fix seems like a good idea regardless of how that ends up being handled.

* tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Fix include dependency in asm/irqflags.h
---

17858ca65eef148d335ffd4cfc09228a1c1cbfb5