Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Apr 2006 00:09:41 +0000 (17:09 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Apr 2006 00:09:41 +0000 (17:09 -0700)
commitf2f4d9e8cb7d4180ac1830eec49e18fef701c58c
tree3a042124aec266d4463964a8d3429aa269fd3ecf
parentf05472f10db38ac5a1ac3f1fa469510471152561
parent5fdef394953d8660c70cc27b27db421582c42bf9
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  commit 5fdef394953d8660c70cc27b27db421582c42bf9
  Author: David S. Miller <davem@sunset.davemloft.net>
  Date:   Fri Apr 14 15:29:32 2006 -0700

      [SPARC]: Hook up sys_tee() into syscall tables.

Signed-off-by: David S. Miller <davem@davemloft.net>