From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 May 2012 15:30:35 +0000 (-0700)
Subject: Merge tag 'cris-for-linus' of git://jni.nu/cris
X-Git-Tag: MMI-PSA29.97-13-9~16683
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'cris-for-linus' of git://jni.nu/cris

Pull CRIS changes from Jesper Nilsson:
 "No major changes here, but fixes some compile errors for CRIS, some
  small style issues, some documentation and as a bonus nukes a couple
  of obsolete rtc-files and related code."

* tag 'cris-for-linus' of git://jni.nu/cris:
  cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile
  CRIS: Remove legacy RTC drivers
  cris/mm/fault.c: Port OOM changes to do_page_fault
  cris:fix the wrong function declear
  CRIS: Add _sdata to vmlinux.lds.S
  cris: posix_types.h, include asm-generic/posix_types.h
  CRIS: Update documentation
  cris/arch-v32: cryptocop: Use kzalloc
  net:removed the unused variable
  cris:removed the unused variable
  CRISv32: Correct name of read_mostly section.
---

4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85