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
am200epd.c
am300epd.c
balloon3.c
capc7117.c
clock-pxa2xx.c
clock-pxa3xx.c
clock.c	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
clock.h	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
cm-x2xx-pci.c
cm-x2xx-pci.h
cm-x2xx.c
cm-x255.c
cm-x270.c
cm-x300.c
colibri-evalboard.c
colibri-pxa3xx.c
colibri-pxa270-income.c
colibri-pxa270.c
colibri-pxa300.c
colibri-pxa320.c
corgi_pm.c
corgi.c
cpufreq-pxa2xx.c
cpufreq-pxa3xx.c
csb701.c
csb726.c
devices.c
devices.h
em-x270.c
eseries.c
eseries.h
ezx.c
generic.c
generic.h
gumstix.c
h5000.c
himalaya.c
hx4700.c
icontrol.c
idp.c
irq.c
Kconfig	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
leds-idp.c
leds-lubbock.c
leds-mainstone.c
leds.c
leds.h
littleton.c
lpd270.c
lubbock.c
magician.c
mainstone.c
Makefile
Makefile.boot
mfp-pxa2xx.c
mfp-pxa3xx.c
mioa701_bootresume.S
mioa701.c
mp900.c
mxm8x10.c
palm27x.c
palmld.c
palmt5.c
palmtc.c
palmte2.c
palmtreo.c
palmtx.c
palmz72.c
pcm027.c
pcm990-baseboard.c
pm.c
poodle.c
pxa2xx.c
pxa3xx-ulpi.c
pxa3xx.c
pxa25x.c
pxa27x.c
pxa95x.c
pxa300.c
pxa320.c
pxa930.c
raumfeld.c
reset.c
saar.c
saarb.c
sharpsl_pm.c
sleep.S	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
smemc.c
spitz_pm.c
spitz.c
standby.S
stargate2.c
tavorevb3.c
tavorevb.c
time.c
tosa-bt.c
tosa.c
trizeps4.c
viper.c
vpac270.c
xcep.c
z2.c
zeus.c
zylonite_pxa300.c
zylonite_pxa320.c
zylonite.c