kevin/linux
1
Fork 0
Code
ac0f6f927d
linux/arch/arm/mach-davinci
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
board-da830-evm.c DA8xx/OMAP-L1xx: Add high speed SD/MMC capabilities 2009-11-25 10:21:38 -08:00
board-da850-evm.c da850/omap-l138: add callback to control LCD panel power 2009-12-16 07:20:05 -08:00
board-dm355-evm.c Davinci VPFE Capture: Take i2c adapter id through platform data 2010-01-06 08:57:43 -08:00
board-dm355-leopard.c DaVinci: rename setup_usb() to davinci_setup_usb() 2009-11-25 10:21:33 -08:00
board-dm365-evm.c V4L/DVB: DaVinci - Adding platform & board changes for vpfe capture on DM365 2010-02-26 15:11:06 -03:00
board-dm644x-evm.c Davinci VPFE Capture: Take i2c adapter id through platform data 2010-01-06 08:57:43 -08:00
board-dm646x-evm.c davinci: fix section mismatch warning in arch/arm/mach-davinci/board-dm646x-evm.c 2009-11-25 10:21:38 -08:00
board-neuros-osd2.c davinci: Initial support for Neuros OSD2 platform. 2009-11-25 10:21:39 -08:00
board-sffsdr.c davinci: remove unused variable in arch/arm/mach-davinci/board-sffsdr.c 2009-11-25 10:21:38 -08:00
clock.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
clock.h davinci: DA8xx: rename 'psc_ctlr' field into 'gpsc' 2009-11-25 10:21:30 -08:00
common.c davinci: make it easier to identify SoC init failures 2009-11-25 10:21:31 -08:00
cp_intc.c davinci: cp_intc: provide set_wake function 2010-01-06 08:57:44 -08:00
cpufreq.c davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator 2009-11-25 10:21:37 -08:00
cpuidle.c davinci: add CPU idle driver 2009-11-25 10:21:37 -08:00
da830.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
da850.c davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator 2009-11-25 10:21:37 -08:00
devices-da8xx.c davinci: da8xx/omap-l1: mark RTC as a wakeup source 2010-01-06 08:57:44 -08:00
devices.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
dm355.c V4L/DVB: vpfe-capture: converting ccdc drivers to platform-drivers 2010-02-26 15:10:45 -03:00
dm365.c V4L/DVB: DaVinci - Adding platform & board changes for vpfe capture on DM365 2010-02-26 15:11:06 -03:00
dm644x.c V4L/DVB: vpfe-capture: converting ccdc drivers to platform-drivers 2010-02-26 15:10:45 -03:00
dm646x.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
dma.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
gpio.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
io.c ARM: Add caller information to ioremap 2010-02-15 21:39:11 +00:00
irq.c davinci: Move interrupt ctlr info to SoC infrastructure 2009-05-26 08:18:09 -07:00
Kconfig davinci: Initial support for Neuros OSD2 platform. 2009-11-25 10:21:39 -08:00
Makefile davinci: Initial support for Neuros OSD2 platform. 2009-11-25 10:21:39 -08:00
Makefile.boot davinci: da8xx: Add base DA830/OMAP-L137 SoC support 2009-08-26 10:56:59 +03:00
mux.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
mux.h davinci: update pin-multiplexing support 2009-04-27 09:49:46 -07:00
psc.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
serial.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
sram.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
time.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
usb.c DA8xx: MUSB platform device registration 2009-11-25 10:21:33 -08:00