]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 20:27:41 +0000 (13:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 20:27:41 +0000 (13:27 -0700)
commit61b1fc10e9d3c27ec8904523de3461f3dd3d638a
tree466ffd550f978b1e066bb9935af456f4db463275
parent3a8b64d4a175246fe638e3fb133ed4c49678df36
parentd78b9913084574ff62f2a983763f87b828a85d76
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’