arch/arm/plat-mxc/devices/Makefile · fde7d9049e55ab85a390be7f415d74c9f62dd0f9 · Ture Bentzin / linux

Oct 20, 2011
a32750c2
Merge branches 'imx/pata' and 'imx/sata' into next/driver · a32750c2
Arnd Bergmann authored Oct 20, 2011
```
Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h
```
a32750c2
Merge branches 'imx/pata' and 'imx/sata' into next/driver
Arnd Bergmann authored Oct 20, 2011
```
Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h
```