linux/arch/arm/boot
Arnd Bergmann 944483d033 Merge branch 'next/fixes-non-critical' into next/soc
This resolves a nontrivial conflict against a bug fix
in another branch.

Conflicts:
	arch/arm/mach-exynos/pm.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26 17:54:21 +02:00
..
bootp
compressed Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next 2014-06-05 15:57:04 -07:00
dts Merge branch 'next/fixes-non-critical' into next/soc 2014-07-26 17:54:21 +02:00
.gitignore
Makefile arm, kbuild: make "make install" not depend on vmlinux 2013-10-02 22:30:35 +02:00
install.sh arm, kbuild: make "make install" not depend on vmlinux 2013-10-02 22:30:35 +02:00