arch/arm/mach-pxa/Kconfig · v2.6.38-rc1 · CM-Shield / android_kernel_asus_tf701t · GitLab

Jan 06, 2011
404a02cb
Merge branch 'devel-stable' into devel · 404a02cb
Russell King authored Jan 06, 2011
```
Conflicts:
	arch/arm/mach-pxa/clock.c
	arch/arm/mach-pxa/clock.h
```
404a02cb
Merge branch 'devel-stable' into devel
Russell King authored Jan 06, 2011
```
Conflicts:
	arch/arm/mach-pxa/clock.c
	arch/arm/mach-pxa/clock.h
```