diff options
| author | Olof Johansson <olof@lixom.net> | 2014-08-08 00:03:02 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-08-08 00:03:02 +0200 |
| commit | c4846a7823bfd34ecb2dc56b025e19285432d08d (patch) | |
| tree | a2b5d4140a38566cb4ba12c7cc9813a47846def5 /arch/arm/Makefile | |
| parent | video: clcd-versatile: Depend on ARM (diff) | |
| parent | drivers: CCI: Correct use of ! and & (diff) | |
| download | linux-c4846a7823bfd34ecb2dc56b025e19285432d08d.tar.xz linux-c4846a7823bfd34ecb2dc56b025e19285432d08d.zip | |
Merge branch 'next/fixes-non-critical' into next/cleanup
Merging in the few fixes we had also received, no need to keep those in
a separate branch.
* next/fixes-non-critical:
drivers: CCI: Correct use of ! and &
MAINTAINERS: Add sdhci-st file to ARCH/STI architecture
ARM: EXYNOS: Fix build breakge with PM_SLEEP=n
ARM: omap2+: gpmc-nand: Use dynamic platform_device_alloc()
omap16xx: Removes fixme no longer needed in ocpi_enable()
ARM: dts: OMAP5: Add device nodes for ABB
ARM: omap2+: usb-tusb6010.c: Cleaning up variable is set more than once
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Makefile')
0 files changed, 0 insertions, 0 deletions