Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Partially revert "Constify function pointer tables."

arch/sparc64/solaris/socksys.c

···
 
 static unsigned int (*sock_poll)(struct file *, poll_table *);
 
-static const struct file_operations socksys_file_ops = {
+static struct file_operations socksys_file_ops = {
 	/* Currently empty */
 };