tree b671af9557db240bbc880ddbaebea471338fa7a0
parent 08f1c192c3c32797068bfe97738babb3295bbf42
parent 3167d93fc0cb81541dea551dc14411ed211eb9e0
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1185075531 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1185075531 -0700

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.