Merge branch 'wire-accept4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jan 2012 04:40:12 +0000 (20:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jan 2012 04:40:12 +0000 (20:40 -0800)
commit5df1b274cd2f0304339c7f5586fa16cce0fdfce2
tree3c04d03acdeaef1c3c9b264671ea8adecc46e362
parent69e4747ee9727d660b88d7e1efe0f4afcb35db1b
parent65cc21b4523e94d5640542a818748cd3be8cd6b4
Merge branch 'wire-accept4' of git://git./linux/kernel/git/aegl/linux

* 'wire-accept4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: Add accept4() syscall