diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:38:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 20:38:51 -0700 |
| commit | 6df8cd3d4f921762504c4d1e7ed702b745702543 (patch) | |
| tree | b671af9557db240bbc880ddbaebea471338fa7a0 /arch/i386 | |
| parent | 08f1c192c3c32797068bfe97738babb3295bbf42 (diff) | |
| parent | 3167d93fc0cb81541dea551dc14411ed211eb9e0 (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:
[SPARC64]: ERROR: "sys_ioctl" [arch/sparc64/solaris/solaris.ko] undefined!
[SPARC32]: Make PAGE_SHARED a read-mostly variable.
[SPARC32]: Take enable_irq/disable_irq out of line.
[SPARC32]: clean include/asm-sparc/irq.h
[SPARC32]: Fix rounding errors in ndelay/udelay implementation.
Diffstat (limited to 'arch/i386')
0 files changed, 0 insertions, 0 deletions