arch/arm/include/asm/pgtable.h · 237ec6f2e51d2fc2ff37c7c5f1ccc9264d09c85b · jan.koester / Linux · GitLab

Jan 05, 2012
2e0e9434
Merge branch 'devel-stable' into for-linus · 2e0e9434
Russell King authored Jan 05, 2012
```
Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
```
2e0e9434
Merge branch 'devel-stable' into for-linus
Russell King authored Jan 05, 2012
```
Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
```