Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 15:57:50 +0000 (08:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Aug 2010 15:57:50 +0000 (08:57 -0700)
commit93b9e9a2d91b8a6c93f14e98382694f83de9f02e
tree0344741b0dbac09aea7f289ad25f412923c9d165
parentc3d1f1746b966907ba5ad2f75ddca24db8b21147
parent9354a55f9490aff8e5d4abedec3db78093772cae
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