| commit | 0e9871df2389560e94ba01e40959140ee56def4b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu May 31 09:14:12 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu May 31 09:14:12 2007 -0700 |
| tree | 249e21834a45ab2fb96f25141675f343c1f2490a | |
| parent | b9066c268abfe353edf5d646bb486bc03c839348 [diff] | |
| parent | 8a73709ecc6a972c94e6ff9c0cc639f8f38b9151 [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Missing #include <linux/mm.h> in drivers/sbus/char/flash.c [SPARC32]: Build fix. [SPARC64]: Add missing NCS and SVC hypervisor interfaces.