arch/arm/mach-pxa/pxa3xx.c · 14a3c4ab0e58d143c7928c9eb2f2610205e13bf2 · Kirill Smelkov / linux

Russell King authored Dec 02, 2008

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

Conflicts:

	arch/arm/mach-pxa/pxa25x.c

c5b84b3b

pxa3xx.c 13.9 KB