diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 20:33:34 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 20:33:34 +0100 |
commit | 1583171492eb514e267c7b51e96846b38de0f544 (patch) | |
tree | a417007b9140e3b497e31fd21889abed410a442d /fs/nfs/file.c | |
parent | Merge branch 'nfs-for-3.2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
parent | arch/tile: factor out <arch/opcode.h> header (diff) | |
download | linux-1583171492eb514e267c7b51e96846b38de0f544.tar.xz linux-1583171492eb514e267c7b51e96846b38de0f544.zip |
Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile
* 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile:
arch/tile: factor out <arch/opcode.h> header
arch/tile: add the <arch> headers to the set of installed kernel headers
arch/tile: avoid exporting a symbol no longer used by gcc
arch/tile: avoid ISO namespace pollution with <asm/sigcontext.h>
Diffstat (limited to 'fs/nfs/file.c')
0 files changed, 0 insertions, 0 deletions