diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 04:40:45 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-21 04:40:45 +0400 |
commit | f3e96492f6da63eba56f04f3c5cc2af524b5a925 (patch) | |
tree | 94dcd9521bbd937cb9d5fc7b30a48ec20d2a6980 /fs/nfs/pnfs.c | |
parent | 8653b3f1d5bf2c7b09962a5747c74280758444ee (diff) | |
parent | e9569c1511d2590a27b46b94bafb7acece034e5c (diff) | |
download | linux-f3e96492f6da63eba56f04f3c5cc2af524b5a925.tar.xz |
Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: 6881/1: cputype.h uses __attribute_const__ which requires including kernel.h
ARM: Add new syscalls
Diffstat (limited to 'fs/nfs/pnfs.c')
0 files changed, 0 insertions, 0 deletions