Russell King 988addf82e Merge branch 'origin' into devel-stable ...

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c

2010-03-08 20:21:04 +00:00

..

include/mach

Merge branch 'misc2' into devel

2010-02-25 22:09:41 +00:00

addr-map.c

…

buffalo-wxl-setup.c

[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)

2010-02-23 17:10:08 -05:00

common.c

[ARM] properly report mv78100 stepping A1

2009-11-05 23:03:19 -05:00

common.h

…

db78x00-bp-setup.c

…

irq.c

[ARM] orion: convert gpio to use gpiolib

2009-06-08 13:04:57 -04:00

Kconfig

[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)

2010-02-23 17:10:08 -05:00

Makefile

[ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo)

2010-02-23 17:10:08 -05:00

Makefile.boot

…

mpp.c

[ARM] MV78XX0: MPP routines and definitions

2010-02-23 16:44:01 -05:00

mpp.h

[ARM] MV78XX0: MPP routines and definitions

2010-02-23 16:44:01 -05:00

pcie.c

…

rd78x00-masa-setup.c

…