tree 7b78bf5196ca79f52f0fd7c932ea8062c91ff154
parent ed8f37370d83e695c0a4fa5d5fc7a83ecb947526
parent d1afa65ca59d4e6a5f1a8c1ab9bfa73f2fa8b777
author Linus Torvalds <torvalds@linux-foundation.org> 1312355771 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312355771 -1000

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