diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 00:13:42 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 00:13:42 +0200 |
commit | d85714d81cc0408daddb68c10f7fd69eafe7c213 (patch) | |
tree | 99b14cd138681a777f0d8651c87d3ee758c6f98f /include/asm-m68k/apollohw.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff) | |
parent | [IA64] fix non-numa build (diff) | |
download | linux-d85714d81cc0408daddb68c10f7fd69eafe7c213.tar.xz linux-d85714d81cc0408daddb68c10f7fd69eafe7c213.zip |
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] fix non-numa build
Diffstat (limited to 'include/asm-m68k/apollohw.h')
0 files changed, 0 insertions, 0 deletions