| commit | d85714d81cc0408daddb68c10f7fd69eafe7c213 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 17 Oct 2007 22:13:42 +0000 (17 15:13 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Wed, 17 Oct 2007 22:13:42 +0000 (17 15:13 -0700) | ||
| tree | 99b14cd138681a777f0d8651c87d3ee758c6f98f | treesnapshot (tar.gz zip) |
| parent | 9d8190f87b5458160ba75d05e8ad6abefbe48a26 | commitdiff |
| parent | 7259888e84d5b6680c9d1f933654f4bdeed61700 | commitdiff |
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 non-numa build
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix non-numa build