commit | 4ba152596de23038e5bca413d23c3fe6fa92ff45 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 09 19:03:49 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 09 19:03:49 2009 -0800 |
tree | 39d6823f12cd1f9d760146294128c093b962ffb3 | |
parent | 3a43aaa31790c36b69ebf8a6396f37fade86b531 [diff] | |
parent | 27a338a69ed9a8a672cd620f5fd7fa450209313c [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 cut/paste detritus from unistd.h