Skip to content
Commit a32750c2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branches 'imx/pata' and 'imx/sata' into next/driver 

Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h
parents 318007e9 d870ea1d
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment