Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 20:27:41 +0000 (13:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 20:27:41 +0000 (13:27 -0700)
commit2a554736f0d518b7c4d9939c6a6842bffebc7475
tree466ffd550f978b1e066bb9935af456f4db463275
parentd15ca3203754359cfe5d18910722d3089b204cc4
parent145e5aa269d54e4ea53fdb5e597007bd287fbe49
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix build error: conflicting types for ‘sys_execve’