Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jan 2014 02:07:52 +0000 (18:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jan 2014 02:07:52 +0000 (18:07 -0800)
commit19ba20f455a8e9cf15c12891e751fd73c9026292
tree7d3322f1170859a2abef4c7fcfeb523266ab73a5
parent3308ee8f4582f97d1c08864dd06f7291aea323e5
parenta54983ae64b12cf7e098c464c7eaf058752bc9cc
Merge git://git./linux/kernel/git/davem/sparc

Pull sparc update from David Miller:
 "Two cleanups from Paul Gortmaker and hook up the new scheduler system
  calls"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc: Hook up sched_setattr and sched_getattr syscalls.
  sparc: don't use module_init in non-modular pci.c code
  sparc: delete non-required instances of include <linux/init.h>