diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:50:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 12:50:00 -0700 |
commit | 6e18933f2b6156d0a0ec9d5522ab6a6033cf7241 (patch) | |
tree | f8045942c4b5c250fd4eec8331fec8a7e2962974 /drivers/macintosh | |
parent | eb855fd8e7f6b1d8b50f24aa36803e29b367b041 (diff) | |
parent | 03970f065d9b4b156d0e879f82989440f7045396 (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:
[PATCH] Build fix for CONFIG_NUMA=y && CONFIG_SMP=n
[IA64] fix bootmem regression on Altix
Diffstat (limited to 'drivers/macintosh')
0 files changed, 0 insertions, 0 deletions