]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  commit 3533386ca2c65d492fd22b38020fee4c1a72fcd3
  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>

Trivial merge