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: MMI-PSA29.97-13-9~25712
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4ba152596de23038e5bca413d23c3fe6fa92ff45;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

4ba152596de23038e5bca413d23c3fe6fa92ff45