Merge tag 'please-pull-fixia64' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jun 2013 16:29:19 +0000 (06:29 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Jun 2013 16:29:19 +0000 (06:29 -1000)
commit17858ca65eef148d335ffd4cfc09228a1c1cbfb5
tree2147c4dff4ae9d28f0645683c71684520de191f9
parent4c3577c58f7efcddeaa269e7ddbe75e8acfbb7de
parentf75773103d24faaa75323597c2804edfb4a48a52
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