diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 03:16:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 03:16:11 -0400 |
| commit | 1850536b93888e6cc3ee42e63e20e61f35f8b3e2 (patch) | |
| tree | 7b78bf5196ca79f52f0fd7c932ea8062c91ff154 /Documentation | |
| parent | ed8f37370d83e695c0a4fa5d5fc7a83ecb947526 (diff) | |
| parent | d1afa65ca59d4e6a5f1a8c1ab9bfa73f2fa8b777 (diff) | |
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 'Documentation')
| -rw-r--r-- | Documentation/ioctl/ioctl-number.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 72ba8d51dbc1..845a191004b1 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt | |||
| @@ -292,6 +292,7 @@ Code Seq#(hex) Include File Comments | |||
| 292 | <mailto:buk@buks.ipn.de> | 292 | <mailto:buk@buks.ipn.de> |
| 293 | 0xA0 all linux/sdp/sdp.h Industrial Device Project | 293 | 0xA0 all linux/sdp/sdp.h Industrial Device Project |
| 294 | <mailto:kenji@bitgate.com> | 294 | <mailto:kenji@bitgate.com> |
| 295 | 0xA2 00-0F arch/tile/include/asm/hardwall.h | ||
| 295 | 0xA3 80-8F Port ACL in development: | 296 | 0xA3 80-8F Port ACL in development: |
| 296 | <mailto:tlewis@mindspring.com> | 297 | <mailto:tlewis@mindspring.com> |
| 297 | 0xA3 90-9F linux/dtlk.h | 298 | 0xA3 90-9F linux/dtlk.h |