diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 18:53:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-19 18:53:02 -0800 |
| commit | 3108864e2d70891d30d60af6af256a1b517d7078 (patch) | |
| tree | f127ddaf0b582098caf7f9e3ed18ed535324eae4 /drivers/misc/eeprom_93cx6.c | |
| parent | 4f7dbc7ff4ec19b40ec083f7c54a87d3ece0089d (diff) | |
| parent | 604d20554883cf03f888440d58ea7c6d36899839 (diff) | |
Merge branch 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: make NUMA on 32-bit depend on EXPERIMENTAL again
x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set
Diffstat (limited to 'drivers/misc/eeprom_93cx6.c')
0 files changed, 0 insertions, 0 deletions