kevin/linux
1
Fork 0
Code
ac0f6f927d
linux/arch/arm/mach-pxa
History
Linus Torvalds ac0f6f927d Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)
  ARM: Eliminate decompressor -Dstatic= PIC hack
  ARM: 5958/1: ARM: U300: fix inverted clk round rate
  ARM: 5956/1: misplaced parentheses
  ARM: 5955/1: ep93xx: move timer defines into core.c and document
  ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c
  ARM: 5953/1: ep93xx: fix broken build of clock.c
  ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig
  ARM: 5949/1: NUC900 add gpio virtual memory map
  ARM: 5948/1: Enable timer0 to time4 clock support for nuc910
  ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk
  ARM: make_coherent(): fix problems with highpte, part 2
  MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself
  ARM: 5945/1: ep93xx: include correct irq.h in core.c
  ARM: 5933/1: amba-pl011: support hardware flow control
  ARM: 5930/1: Add PKMAP area description to memory.txt.
  ARM: 5929/1: Add checks to detect overlap of memory regions.
  ARM: 5928/1: Change type of VMALLOC_END to unsigned long.
  ARM: 5927/1: Make delimiters of DMA area globally visibly.
  ARM: 5926/1: Add "Virtual kernel memory..." printout.
  ARM: 5920/1: OMAP4: Enable L2 Cache
  ...

Fix up trivial conflict in arch/arm/mach-mx25/clock.c
2010-03-01 09:15:15 -08:00
..
include/mach Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-03-01 09:15:15 -08:00
am200epd.c
am300epd.c
balloon3.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +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
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
cm-x270.c [ARM] pxa/cm-x270: add libertas device registration 2009-09-10 18:49:34 +08:00
cm-x300.c [ARM] pxa/cm-x300: add PWM backlight support 2009-12-16 16:49:22 +08:00
colibri-pxa3xx.c pxa3xx_nand: move pxa3xx_nand.h common into plat directory 2009-12-01 09:02:43 +08:00
colibri-pxa270.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
colibri-pxa300.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
colibri-pxa320.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
corgi_lcd.c
corgi_pm.c [ARM] pxa/zaurus: rename spitz_battery_levels_* to sharpsl_* 2009-12-01 09:03:01 +08:00
corgi_ssp.c
corgi.c [ARM] pxa/corgi: fix incorrect default GPIO for UDC Vbus 2010-01-13 21:01:08 +08:00
cpufreq-pxa2xx.c [ARM] pxa/cpufreq: fix index assignments for end marker 2009-11-20 14:23:13 -06:00
cpufreq-pxa3xx.c [ARM] pxa/cpufreq: fix index assignments for end marker 2009-11-20 14:23:13 -06:00
csb701.c
csb726.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
devices.c [ARM] pxa: fix no reference of cpu_is_pxa25x() in devices.c 2009-12-16 21:35:52 +08:00
devices.h [ARM] pxa: add device definition for graphics controller 2009-09-10 18:49:27 +08:00
e330.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
e350.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
e400.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
e740.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
e750.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
e800.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
em-x270.c [ARM] pxa/em-x270: fix usb hub power up/reset sequence 2009-12-13 21:42:57 +08:00
eseries.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00: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
generic.h [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08: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
idp.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
imote2.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
irq.c [ARM] pxa: fix irq suspend/resume for pxa25x 2010-01-13 21:01:09 +08:00
Kconfig [ARM] pxa/littleton: select CPU_PXA300 and CPU_PXA310 2009-12-29 14:11:29 +08:00
leds-idp.c
leds-lubbock.c
leds-mainstone.c
leds.c
leds.h
littleton.c [ARM] pxa/littleton: add UART3 GPIO config 2009-12-29 14:11:28 +08:00
lpd270.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
lubbock.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
magician.c [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *' 2010-01-04 11:42:01 +08:00
mainstone.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
Makefile [ARM] pxa/zeus: basic support for Arcom Zeus SBC 2009-12-13 21:42:58 +08:00
Makefile.boot
mfp-pxa2xx.c
mfp-pxa3xx.c
mioa701_bootresume.S
mioa701.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
mp900.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
palmld.c [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *' 2010-01-04 11:42:01 +08:00
palmt5.c [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *' 2010-01-04 11:42:01 +08:00
palmtc.c [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *' 2010-01-04 11:42:01 +08:00
palmte2.c [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *' 2010-01-04 11:42:01 +08:00
palmtreo.c [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *' 2010-01-04 11:42:01 +08:00
palmtx.c [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *' 2010-01-04 11:42:01 +08:00
palmz72.c [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *' 2010-01-04 11:42:01 +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/pcm990: don't use pxa_camera init() callback 2009-12-01 09:03:14 +08:00
pm.c
poodle.c [ARM] pxa/poodle: fix incorrect 'gpio_card_detect' of MMC 2009-12-29 14:11:35 +08:00
pxa2xx.c [ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.c 2009-09-10 18:49:39 +08:00
pxa3xx.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
pxa25x.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
pxa27x.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00: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
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/zaurus: rename spitz_battery_levels_* to sharpsl_* 2009-12-01 09:03:01 +08:00
sharpsl.h [ARM] pxa/zaurus: rename spitz_battery_levels_* to sharpsl_* 2009-12-01 09:03:01 +08:00
sleep.S
smemc.c
spitz_pm.c [ARM] pxa/zaurus: rename spitz_battery_levels_* to sharpsl_* 2009-12-01 09:03:01 +08:00
spitz.c [ARM] pxa: fix strange characters in zaurus gpio .desc 2010-01-08 09:42:45 +08:00
ssp.c [ARM] pxa: use platform_device_id table for SSP driver 2009-12-01 09:02:52 +08:00
standby.S
stargate2.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
tavorevb.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
time.c
tosa-bt.c
tosa.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
trizeps4.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
viper.c [ARM] pxa: update pwm_backlight->notify() to include missed 'struct device *' 2010-01-04 11:42:01 +08:00
xcep.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
zeus.c [ARM] pxa/zeus: provide power-source information when APM is enabled 2009-12-29 14:11:32 +08: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
zylonite.c [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot 2009-12-29 14:11:34 +08:00