| commit | 5f243b9b46a22e5790dbbc36f574c2417af49a41 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 04 10:41:54 2013 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 04 10:41:54 2013 -0800 |
| tree | 923c175213be85ae5b82f4d15db6230283756bf7 | |
| parent | 6ed1914982e9cd46e37a6a6aa9e1fd1de6a50bf7 [diff] | |
| parent | 25c92a37a8191b5fdbbba7bdc917e14766a52461 [diff] |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 Pull ARM64 fixes from Catalin Marinas: - Missing include in asm/compat.h. - Kconfig updates. * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: arm64: Always select ARM_AMBA and GENERIC_GPIO arm64: Keep the ARM64 Kconfig selects sorted arm64: Include linux/ptrace.h in asm/compat.h