| commit | 93b9e9a2d91b8a6c93f14e98382694f83de9f02e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 05 08:57:50 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 05 08:57:50 2010 -0700 |
| tree | 0344741b0dbac09aea7f289ad25f412923c9d165 | |
| parent | c3d1f1746b966907ba5ad2f75ddca24db8b21147 [diff] | |
| parent | 9354a55f9490aff8e5d4abedec3db78093772cae [diff] |
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] 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