diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 13:27:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 13:27:41 -0700 |
| commit | 2a554736f0d518b7c4d9939c6a6842bffebc7475 (patch) | |
| tree | 466ffd550f978b1e066bb9935af456f4db463275 /crypto | |
| 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’
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions