diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 10:48:30 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 10:48:30 +0100 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /arch/microblaze/include/uapi/asm/param.h | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'arch/microblaze/include/uapi/asm/param.h')
| -rw-r--r-- | arch/microblaze/include/uapi/asm/param.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/microblaze/include/uapi/asm/param.h b/arch/microblaze/include/uapi/asm/param.h new file mode 100644 index 000000000000..965d45427975 --- /dev/null +++ b/arch/microblaze/include/uapi/asm/param.h @@ -0,0 +1 @@ +#include <asm-generic/param.h> |