original_kernel/arch/arm/mach-nomadik
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
include/mach
Kconfig
Makefile
Makefile.boot
board-nhk8815.c
clock.c
clock.h
cpu-8815.c
gpio.c
i2c-8815nhk.c