Merge tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 01:50:34 +0000 (03:50 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 01:50:34 +0000 (03:50 +0200)
Pull ia64 update from Tony Luck:
 "Wire up bpf syscall for ia64"

* tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Enable bpf syscall for ia64


Trivial merge