]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge tag 'for-linus-20130929' of git://github.com/sctscore/official-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Sep 2013 17:38:46 +0000 (10:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Sep 2013 17:38:46 +0000 (10:38 -0700)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge