diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-29 12:44:43 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-29 12:44:43 +0200 |
| commit | 3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727 (patch) | |
| tree | d0f196c53d209f44190fd8a6481823b7770866e6 /arch/arm/mach-socfpga/socfpga.c | |
| parent | Merge branches 'fixes', 'mcpm', 'misc' and 'mmci' into for-next (diff) | |
| parent | ARM: 7775/1: mm: Remove do_sect_fault from LPAE code (diff) | |
| download | linux-3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727.tar.xz linux-3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727.zip | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/Makefile
arch/arm/include/asm/glue-proc.h
Diffstat (limited to 'arch/arm/mach-socfpga/socfpga.c')
0 files changed, 0 insertions, 0 deletions