diff options
author | David S. Miller <davem@davemloft.net> | 2009-04-13 21:41:05 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-13 21:41:05 (GMT) |
commit | 83400207a07584539366f6859362db6872809a12 (patch) | |
tree | fad187f8b3bebf1b387ec42ef8143e6f4e49a256 /arch/mn10300/include/asm/fcntl.h | |
parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
download | linux-83400207a07584539366f6859362db6872809a12.tar.xz |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/mn10300/include/asm/fcntl.h')
-rw-r--r-- | arch/mn10300/include/asm/fcntl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mn10300/include/asm/fcntl.h b/arch/mn10300/include/asm/fcntl.h new file mode 100644 index 0000000..46ab12d --- /dev/null +++ b/arch/mn10300/include/asm/fcntl.h @@ -0,0 +1 @@ +#include <asm-generic/fcntl.h> |