From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Aug 2011 07:16:11 +0000 (-1000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
X-Git-Tag: v3.1-rc1~81
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1850536b93888e6cc3ee42e63e20e61f35f8b3e2;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile/mm/init.c: trivial: use BUG_ON
  arch/tile: remove useless set_fixmap_nocache() macro
  arch/tile: add hypervisor-based character driver for SPI flash ROM
  ioctl-number.txt: add the tile hardwall ioctl range
  tile: use generic-y format for one-line asm-generic headers
  clocksource: tile: convert to use clocksource_register_hz
---

1850536b93888e6cc3ee42e63e20e61f35f8b3e2