diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-25 11:11:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-25 11:11:40 +0200 |
| commit | 85e63343f49cdf859bb630ba39d9a9af85dfb3e6 (patch) | |
| tree | 8c72184c38d93a34e08f386ae70b4ee12ed7ac20 /arch/sh/include/asm/mman.h | |
| parent | regulator: rc5t583: Use regulator_set_voltage_time_sel() (diff) | |
| parent | Linux 3.5-rc4 (diff) | |
| download | linux-85e63343f49cdf859bb630ba39d9a9af85dfb3e6.tar.xz linux-85e63343f49cdf859bb630ba39d9a9af85dfb3e6.zip | |
Merge tag 'v3.5-rc4' into regulator-drivers
Linux 3.5-rc4 contains patches which conflict with some of the
development work.
Diffstat (limited to 'arch/sh/include/asm/mman.h')
| -rw-r--r-- | arch/sh/include/asm/mman.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/mman.h b/arch/sh/include/asm/mman.h deleted file mode 100644 index 8eebf89f5ab1..000000000000 --- a/arch/sh/include/asm/mman.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/mman.h> |