| commit | 2a554736f0d518b7c4d9939c6a6842bffebc7475 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 18 13:27:41 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 18 13:27:41 2010 -0700 |
| tree | 466ffd550f978b1e066bb9935af456f4db463275 | |
| parent | d15ca3203754359cfe5d18910722d3089b204cc4 [diff] | |
| parent | 145e5aa269d54e4ea53fdb5e597007bd287fbe49 [diff] |
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’