tree 466ffd550f978b1e066bb9935af456f4db463275
parent d15ca3203754359cfe5d18910722d3089b204cc4
parent 145e5aa269d54e4ea53fdb5e597007bd287fbe49
author Linus Torvalds <torvalds@linux-foundation.org> 1282163261 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282163261 -0700

Merge branch 'release' of git://git.kernel.org/pub/scm/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’