From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 22 Jul 2007 03:38:51 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.23-rc1~38
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6df8cd3d4f921762504c4d1e7ed702b745702543;p=linux-2.6-omap-h63xx.git

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.
---

6df8cd3d4f921762504c4d1e7ed702b745702543