lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'devel-stable' into devel

Browse Source 
Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig
This commit is contained in:
Russell King
2010-05-17 17:24:04 +01:00
parent fda0e18c8a a3685f0065
commit ac1d426e82
5500 changed files with 78800 additions and 18040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-integrator/impd1.c
View File

@@ -21,6 +21,7 @@
#include <linux/amba/bus.h>
#include <linux/amba/clcd.h>
#include <linux/io.h>
#include <linux/slab.h>
#include <asm/clkdev.h>
#include <mach/clkdev.h>