diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 14:49:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 14:49:56 -0800 |
| commit | ee867cf97a0290d40868c180e5a2b54761f2f9f0 (patch) | |
| tree | 344b679151699edd17bfe01b3bb98f60d830cc04 /drivers/mtd/nand/omap_elm.c | |
| parent | b1f368b58b3c8095de4cff9eeb69babffab4e3d3 (diff) | |
| parent | 2d39ad649eca1e8a993f4fda244fe17ecea7a38d (diff) | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas:
- enable bpf syscall for compat
- cpu_suspend fix when checking the idle state type
- defconfig update
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: defconfig: update defconfig for 3.18
arm64: compat: Enable bpf syscall
arm64: psci: fix cpu_suspend to check idle state type for index
Diffstat (limited to 'drivers/mtd/nand/omap_elm.c')
0 files changed, 0 insertions, 0 deletions