projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 08f1c19 3167d93)
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)
commit6df8cd3d4f921762504c4d1e7ed702b745702543
treeb671af9557db240bbc880ddbaebea471338fa7a0tree | snapshot
parent08f1c192c3c32797068bfe97738babb3295bbf42commit | diff
parent3167d93fc0cb81541dea551dc14411ed211eb9e0commit | diff
Merge branch 'master' of /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.
Domain: System / Kernel;