From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Apr 2011 00:40:45 +0000 (-0700)
Subject: Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.39-rc5~35
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f3e96492f6da63eba56f04f3c5cc2af524b5a925;p=~shefty%2Frdma-dev.git

Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  ARM: 6881/1: cputype.h uses __attribute_const__ which requires including kernel.h
  ARM: Add new syscalls
---

f3e96492f6da63eba56f04f3c5cc2af524b5a925