tmp_suning_uos_patched/arch/arm/mach-orion5x
Russell King 404a02cbd2 Merge branch 'devel-stable' into devel
Conflicts:
	arch/arm/mach-pxa/clock.c
	arch/arm/mach-pxa/clock.h
2011-01-06 22:33:32 +00:00
..
include/mach
addr-map.c
common.c
common.h
d2net-setup.c
db88f5281-setup.c
dns323-setup.c
edmini_v2-setup.c
irq.c
Kconfig
kurobox_pro-setup.c
ls_hgl-setup.c
ls-chl-setup.c
lsmini-setup.c
Makefile
Makefile.boot
mpp.c
mpp.h
mss2-setup.c
mv2120-setup.c
net2big-setup.c
pci.c
rd88f5181l-fxo-setup.c
rd88f5181l-ge-setup.c
rd88f5182-setup.c
rd88f6183ap-ge-setup.c
terastation_pro2-setup.c
ts78xx-fpga.h
ts78xx-setup.c
ts209-setup.c
ts409-setup.c
tsx09-common.c
tsx09-common.h
wnr854t-setup.c
wrt350n-v2-setup.c