]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge