From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Jan 2011 01:29:53 +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.38-rc1~223
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=375b6f5a40a3d8373561a3dbeed440a845e6d379

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 build error - arch/ia64/kernel/perfmon.c
---

375b6f5a40a3d8373561a3dbeed440a845e6d379