Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Dec 2009 03:03:49 +0000 (19:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Dec 2009 03:03:49 +0000 (19:03 -0800)
commit4ba152596de23038e5bca413d23c3fe6fa92ff45
tree39d6823f12cd1f9d760146294128c093b962ffb3
parent3a43aaa31790c36b69ebf8a6396f37fade86b531
parent27a338a69ed9a8a672cd620f5fd7fa450209313c
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 cut/paste detritus from unistd.h