diff options
author | David S. Miller <davem@davemloft.net> | 2009-06-15 10:02:23 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-15 10:02:23 (GMT) |
commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /include/asm-generic/user.h | |
parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
download | linux-fsl-qoriq-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'include/asm-generic/user.h')
-rw-r--r-- | include/asm-generic/user.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-generic/user.h b/include/asm-generic/user.h new file mode 100644 index 0000000..8b9c3c9 --- /dev/null +++ b/include/asm-generic/user.h @@ -0,0 +1,8 @@ +#ifndef __ASM_GENERIC_USER_H +#define __ASM_GENERIC_USER_H +/* + * This file may define a 'struct user' structure. However, it it only + * used for a.out file, which are not supported on new architectures. + */ + +#endif /* __ASM_GENERIC_USER_H */ |