Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Apr 2008 00:20:53 +0000 (17:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Apr 2008 00:20:53 +0000 (17:20 -0700)
commit8a3227268877b81096d7b7a841aaf51099ad2068
tree73d2b9522aa981d46040b5603c824583c1b18694
parente9b62693ae0a1e13ccc97a6792d9a7770c8d1b5b
parentec98c6b9b47df6df1c1fa6cf3d427414f8c2cf16
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Remove SunOS and Solaris binary support.
Documentation/feature-removal-schedule.txt
arch/sparc64/Kconfig
net/core/sock.c