diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 09:16:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 09:16:11 +0200 |
| commit | 1850536b93888e6cc3ee42e63e20e61f35f8b3e2 (patch) | |
| tree | 7b78bf5196ca79f52f0fd7c932ea8062c91ff154 /fs/Makefile | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
| parent | arch/tile/mm/init.c: trivial: use BUG_ON (diff) | |
| download | linux-1850536b93888e6cc3ee42e63e20e61f35f8b3e2.tar.xz linux-1850536b93888e6cc3ee42e63e20e61f35f8b3e2.zip | |
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
Diffstat (limited to 'fs/Makefile')
0 files changed, 0 insertions, 0 deletions