From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Aug 2010 20:27:41 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.36-rc2~36
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=2a554736f0d518b7c4d9939c6a6842bffebc7475

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’
---

2a554736f0d518b7c4d9939c6a6842bffebc7475