From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jan 2014 02:07:52 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
X-Git-Tag: v3.14-rc1~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19ba20f455a8e9cf15c12891e751fd73c9026292;p=kernel%2Fkernel-generic.git

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>
---

19ba20f455a8e9cf15c12891e751fd73c9026292