diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 08:25:34 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 08:25:34 -0700 |
commit | 6fbfd0592ef88ba29cdce84ef92757351f1fa9c9 (patch) | |
tree | 7c0af4bcc08f3ad7befb93d73d9729f82252c950 /arch/sh/include/asm/statfs.h | |
parent | f2c32a882d2c1cde6fc552a5a3d34b4c1330edb8 (diff) | |
parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) |
Merge v3.5-rc5 into driver-core-next
This picks up the big printk fixes, and resolves a merge issue with:
drivers/extcon/extcon_gpio.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sh/include/asm/statfs.h')
-rw-r--r-- | arch/sh/include/asm/statfs.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/sh/include/asm/statfs.h b/arch/sh/include/asm/statfs.h deleted file mode 100644 index 9202a023328..00000000000 --- a/arch/sh/include/asm/statfs.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_SH_STATFS_H -#define __ASM_SH_STATFS_H - -#include <asm-generic/statfs.h> - -#endif /* __ASM_SH_STATFS_H */ |