From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Aug 2010 15:57:50 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.36-rc1~562
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93b9e9a2d91b8a6c93f14e98382694f83de9f02e;p=platform%2Fupstream%2Fkernel-adaptation-pc.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] increase ia64 static per cpu area
  [IA64] Put ia64 config files on the Uwe Kleine-König diet
  [IA64] perfmon: convert to unlocked_ioctl
  [IA64] beautify vmlinux.lds.h
---

93b9e9a2d91b8a6c93f14e98382694f83de9f02e