From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Dec 2009 03:03:49 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.33-rc1~346
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4ba152596de23038e5bca413d23c3fe6fa92ff45;p=linux.git

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
---

4ba152596de23038e5bca413d23c3fe6fa92ff45