From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=2a554736f0d518b7c4d9939c6a6842bffebc7475;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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’ --- 2a554736f0d518b7c4d9939c6a6842bffebc7475