From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Jun 2010 15:51:25 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://www.jni.nu/cris
X-Git-Tag: v2.6.35-rc2~62
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b904d7131d116900524bd36ec170dcd97846bfd3

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

* 'for-linus' of git://www.jni.nu/cris:
  CRIS: Don't use mask_irq as symbol name
  CRIS: Simplify param.h by simply including <asm-generic/param.h>
  CRISv10: Whitespace fixes for hw_settings.S
  CRISv10: Trivial fixes.
  CRISv32: Fix RS485 port 4 CD Kconfig item.
  CRISv32: Remove duplicated Kconfig items.
  cris: push down BKL into some device drivers
---

b904d7131d116900524bd36ec170dcd97846bfd3