diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:33:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:33:42 +0200 |
| commit | d2819f80d465672b09c2f4cb52303b7f951c4d0f (patch) | |
| tree | aa0262703e86b97ad1460c722e78d7233e24e3bb /arch/arm/include/asm/shmparam.h | |
| parent | 5df33a62c4a028d6fc7f2dcc159827d09b7334b8 (diff) | |
| parent | 366695ff706669d40459174b1cbb78fca42f4e06 (diff) | |
Merge branch 'spear/pinctrl' into spear/clock
Conflicts:
arch/arm/mach-spear3xx/Makefile
arch/arm/mach-spear3xx/clock.c
arch/arm/mach-spear3xx/include/mach/generic.h
arch/arm/mach-spear6xx/clock.c
arch/arm/plat-spear/Makefile
drivers/pinctrl/core.c
This resolves some annoying merge conflicts.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/asm/shmparam.h')
0 files changed, 0 insertions, 0 deletions