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

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel

Browse Source 
Conflicts:

	arch/arm/mach-pxa/pxa25x.c
This commit is contained in:
Russell King
2008-12-02 22:07:40 +00:00
committed by Russell King
parent d281bc9d8a bc2fd1c09c
commit c5b84b3bb0
53 changed files with 2361 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-pxa/clock.c
View File

@@ -14,7 +14,6 @@
#include <asm/clkdev.h>
#include <mach/pxa2xx-regs.h>
#include <mach/pxa2xx-gpio.h>
#include <mach/hardware.h>
#include "devices.h"