]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 22 Jul 2007 03:38:51 +0000 (20:38 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 22 Jul 2007 03:38:51 +0000 (20:38 -0700)
commit8db99fb7339d8dbabe5de547443b40c8dda9be89
treeb671af9557db240bbc880ddbaebea471338fa7a0
parent3141f1f281ebb1adf1a575592a8c40e58e51f828
parent2e3f4c80911543bd7e122289b24b7c1239abfc9c
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.