Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/mach-pxa
History
Mark Brown e4862f2f6f Merge branch 'for-2.6.36' into for-2.6.37 
Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c
2010-08-16 18:42:58 +01:00
..
include/mach Merge branch 'devel-stable' into devel 2010-08-09 14:09:29 +01:00
am200epd.c
am300epd.c broadsheetfb: add multiple panel type support 2010-03-12 15:52:32 -08:00
balloon3.c [ARM] pxa/balloon3: Add MAX1586 PMIC support 2010-08-05 14:32:48 +08:00
capc7117.c [ARM] pxa: add support for Embedian MXM-8x10 2010-03-02 07:40:51 +08:00
clock.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
clock.h ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
cm-x2xx-pci.c ARM: Remove 'node' argument form arch_adjust_zones() 2010-07-16 10:57:36 +01:00
cm-x2xx-pci.h
cm-x2xx.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
cm-x255.c [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms 2010-03-02 07:40:46 +08:00
cm-x270.c [ARM] pxa/cm-x270: avoid direct access of GPIO/MFP registers 2010-03-02 07:40:48 +08:00
cm-x300.c [ARM] pxa/cm-x300: fix ffuart registration 2010-08-05 14:34:58 +08:00
colibri-pxa3xx.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
colibri-pxa270-evalboard.c [ARM] pxa/colibri270: Split module and base board code 2010-06-18 15:07:34 +08:00
colibri-pxa270-income.c [ARM] pxa/income: Add Income SBC support 2010-06-18 15:07:34 +08:00
colibri-pxa270.c [ARM] pxa/income: Add Income SBC support 2010-06-18 15:07:34 +08:00
colibri-pxa300.c [ARM] pxa/colibri-pxa300: fix AC97 init 2010-07-13 16:09:07 +08:00
colibri-pxa320.c [ARM] pxa/colibri320: Add UDC support 2010-08-05 14:32:25 +08:00
corgi.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2010-08-06 18:10:25 +01:00
corgi_pm.c [ARM] pxa: removed mostly unused and confusing two sharpsl.h 2010-08-05 14:32:38 +08:00
cpufreq-pxa2xx.c [ARM] pxa: cpufreq-pxa2xx: fix DRI recomputation routine 2010-08-05 14:32:28 +08:00
cpufreq-pxa3xx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
csb701.c
csb726.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
devices.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
devices.h Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
em-x270.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
eseries.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2010-08-06 18:10:25 +01:00
eseries.h
ezx.c [ARM] pxa/ezx: add leds-lp3944 support for A910 EZX phone 2009-12-01 09:03:03 +08:00
generic.c [ARM] pxa: remove pxa_gpio_mode() and files 2010-05-11 17:25:01 +02:00
generic.h ARM: Remove DISCONTIGMEM support 2010-07-16 10:57:35 +01:00
gumstix.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
h5000.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
himalaya.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
hx4700.c [ARM] pxa/hx4700: actually use platform_lcd driver 2009-12-01 09:03:15 +08:00
icontrol.c Add hotplug support to mcp251x driver 2010-03-30 23:51:09 -07:00
idp.c [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms 2010-03-02 07:40:46 +08:00
irq.c [ARM] pxa: fix irq suspend/resume for pxa25x 2010-01-13 21:01:09 +08:00
Kconfig [ARM] pxa/palm: Flip Palm LD,TX,T5,Z72 to Palm27x 2010-08-05 14:32:40 +08:00
leds-idp.c
leds-lubbock.c
leds-mainstone.c
leds.c
leds.h
littleton.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
lpd270.c [ARM] pxa: add the missing AC97 pin configurations 2010-03-02 07:40:48 +08:00
lubbock.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
magician.c [ARM] pxa: simplify the LCD pin configuration for pxa27x platforms 2010-03-02 07:40:47 +08:00
mainstone.c [ARM] pxa: add the missing AC97 pin configurations 2010-03-02 07:40:48 +08:00
Makefile [ARM] pxa/palm: Introduce Palm27x 2010-08-05 14:32:39 +08:00
Makefile.boot
mfp-pxa2xx.c [ARM] pxa: allow MFP_LPM_INPUT to be explicitly specified 2010-05-11 17:25:00 +02:00
mfp-pxa3xx.c
mioa701.c [ARM] pxa: fix all devices using wm97xx_batt.h 2010-08-05 14:32:14 +08:00
mioa701_bootresume.S
mp900.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
mxm8x10.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
palm27x.c [ARM] pxa/palm: Introduce Palm27x 2010-08-05 14:32:39 +08:00
palmld.c [ARM] pxa/palm: Flip Palm LD,TX,T5,Z72 to Palm27x 2010-08-05 14:32:40 +08:00
palmt5.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2010-08-06 18:10:25 +01:00
palmtc.c [ARM] pxa/palmtc: storage class should be before const qualifier 2010-05-31 12:03:44 +08:00
palmte2.c [ARM] pxa: fix all devices using wm97xx_batt.h 2010-08-05 14:32:14 +08:00
palmtreo.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2010-08-06 18:10:25 +01:00
palmtx.c [ARM] pxa/palm: Flip Palm LD,TX,T5,Z72 to Palm27x 2010-08-05 14:32:40 +08:00
palmz72.c [ARM] pxa/palm: Flip Palm LD,TX,T5,Z72 to Palm27x 2010-08-05 14:32:40 +08:00
pcm027.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
pcm990-baseboard.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
pm.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
poodle.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2010-08-06 18:10:25 +01:00
pxa2xx.c [ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.c 2009-09-10 18:49:39 +08:00
pxa3xx.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
pxa25x.c [ARM] pxa: move pmu device back into mach-pxa/ 2010-08-05 14:32:19 +08:00
pxa27x.c Merge branch 'for-2.6.36' into for-2.6.37 2010-08-16 18:42:58 +01:00
pxa300.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
pxa320.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
pxa930.c [ARM] pxa: support mfp of pxa935 2009-09-10 18:49:24 +08:00
raumfeld.c [ARM] pxa/raumfeld: Check charge state after resume 2010-06-18 15:07:35 +08:00
reset.c
saar.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
sharpsl_pm.c [ARM] pxa: removed mostly unused and confusing two sharpsl.h 2010-08-05 14:32:38 +08:00
sleep.S [ARM] pxa: removing dead XSCALE_CACHE_ERRATA 2010-08-05 14:32:33 +08:00
smemc.c
spitz.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2010-08-06 18:10:25 +01:00
spitz_pm.c [ARM] pxa: removed mostly unused and confusing two sharpsl.h 2010-08-05 14:32:38 +08:00
standby.S
stargate2.c [ARM] pxa: merge stargate2 and imote2 board files 2010-08-05 14:32:16 +08:00
tavorevb.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
time.c arm/{pxa,sa1100,nomadik}: Don't disable irqs in set_next_event and set_mode 2010-01-22 17:04:52 +01:00
tosa-bt.c
tosa.c ARM: Remove DISCONTIGMEM support 2010-07-16 10:57:35 +01:00
trizeps4.c [ARM] pxa: removing dead IDE_PXA_CF 2010-08-05 14:32:34 +08:00
viper.c [ARM] pxa/viper: fix timeout usage for I2C 2010-05-06 11:12:11 +08:00
vpac270.c [ARM] pxa/vpac270: Add VGA modes for ADV7125 2010-06-18 15:07:33 +08:00
xcep.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
z2.c [ARM] pxa/z2: Fix flash layout typo 2010-08-05 14:32:43 +08:00
zeus.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07:00
zylonite.c ASoC: multi-component - ASoC Multi-Component Support 2010-08-12 14:00:00 +01:00
zylonite_pxa300.c [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot 2009-12-29 14:11:34 +08:00
zylonite_pxa320.c [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot 2009-12-29 14:11:34 +08:00