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

diff --combined Documentation/ioctl/ioctl-number.txt
index 72ba8d5,b7dc374..845a191
--- 1/Documentation/ioctl/ioctl-number.txt
--- 2/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@@ -292,6 -292,7 +292,7 @@@ Code  Seq#(hex)    Include File            Comment
                                        <mailto:buk@buks.ipn.de>
  0xA0  all     linux/sdp/sdp.h         Industrial Device Project
                                        <mailto:kenji@bitgate.com>
+ 0xA2  00-0F   arch/tile/include/asm/hardwall.h
  0xA3  80-8F   Port ACL                in development:
                                        <mailto:tlewis@mindspring.com>
  0xA3  90-9F   linux/dtlk.h
@@@ -301,7 -302,6 +302,7 @@@
                                        <mailto:rusty@rustcorp.com.au>
  0xAE  all     linux/kvm.h             Kernel-based Virtual Machine
                                        <mailto:kvm@vger.kernel.org>
 +0xAF  00-1F   linux/fsl_hypervisor.h  Freescale hypervisor
  0xB0  all     RATIO devices           in development:
                                        <mailto:vgo@ratio.de>
  0xB1  00-1F   PPPoX                   <mailto:mostrows@styx.uwaterloo.ca>