From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Sep 2013 17:38:46 +0000 (-0700)
Subject: Merge tag 'for-linus-20130929' of git://github.com/sctscore/official-linux
X-Git-Tag: Ubuntu-5.0.0-8.9~12833
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8945546d90a748d1484872c48823f8c8ab302577;p=mirror_ubuntu-disco-kernel.git

Merge tag 'for-linus-20130929' of git://github.com/sctscore/official-linux

Pull S+core fixes from Lennox Wu:
 "These updates include updating information of maintainers, fix some
  trivial errors, and add a necessary function for supporting ipv6"

* tag 'for-linus-20130929' of git://github.com/sctscore/official-linux:
  Score: Update the information of Score maintaners
  Score: Modify the Makefile of Score, remove -mlong-calls for compiling
  Score: Implement the function csum_ipv6_magic
  Score: The commit is for compiling successfully
---

8945546d90a748d1484872c48823f8c8ab302577