drivers/ata/pata_palmld.c · b43d151e9679a06df896ac3db65a9dca80040fed · nexedi / linux

Russell King authored Mar 26, 2011

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

Conflicts:
	arch/arm/mach-pxa/tosa.c

938c0ace

pata_palmld.c 3.4 KB