kevin/linux
1
Fork 0
Code
1c496784a0
linux/arch/arm
History
Linus Torvalds 1c496784a0 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)
  arm: omap: Add omap3_defconfig
  AM35xx: Defconfig for AM3517 EVM board
  AM35xx: Add support for AM3517 EVM board
  omap: 3630sdp: defconfig creation
  omap: 3630sdp: introduce 3630 sdp board support
  omap3: Add defconfig for IGEP v2 board
  omap3: Add minimal IGEP v2 support
  omap3: Add CompuLab CM-T35 defconfig
  omap3: Add CompuLab CM-T35 board support
  omap3: rx51: Add wl1251 wlan driver support
  omap3: rx51: Add SDRAM init
  omap1: Add default kernel configuration for Herald
  omap1: Add board support and LCD for HTC Herald
  omap: zoom2: update defconfig for LL_DEBUG_NONE
  omap: zoom3: defconfig creation
  omap3: zoom: Introduce zoom3 board support
  omap3: zoom: Drop i2c-1 speed to 2400
  omap3: zoom: rename zoom2 name to generic zoom
  omap3: zoom: split board file for software reuse
  omap3evm: MIgrate to smsc911x ethernet driver
  ...

Fix trivial conflict (two unrelated config options added next to each
other) in arch/arm/mach-omap2/Makefile
2009-12-08 08:15:29 -08:00
..
boot ARM: add base support for Marvell Dove SoC 2009-11-27 15:43:06 -05:00
common ARM: dma-mapping: split dma_unmap_page() from dma_unmap_single() 2009-11-23 12:53:55 +00:00
configs Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2009-12-08 08:15:29 -08:00
include/asm Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-12-08 08:12:43 -08:00
kernel Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-12-08 08:12:43 -08:00
lib
mach-aaec2000
mach-at91 Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00
mach-bcmring Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-12-08 08:12:43 -08:00
mach-clps711x
mach-davinci
mach-dove ARM: Add Tauros2 L2 cache controller support 2009-11-27 15:43:21 -05:00
mach-ebsa110
mach-ep93xx ARM: 5790/1: ep93xx: add missing newline between file header and code 2009-11-24 10:04:17 +00:00
mach-footbridge
mach-gemini
mach-h720x
mach-integrator
mach-iop13xx Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00
mach-iop32x
mach-iop33x
mach-ixp4xx
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695 ARM: dma-mapping: provide dma_to_page() 2009-11-23 12:53:54 +00:00
mach-l7200
mach-lh7a40x
mach-loki
mach-mmp [ARM] pxa: add apmu clock support in mmp 2009-12-01 09:02:51 +08:00
mach-msm
mach-mv78xx0
mach-mx1
mach-mx2 mx27: mxt_td60: Add support to SD/MMC 2009-12-02 12:06:14 +01:00
mach-mx3 mx31moboard: fix typo 2009-12-04 13:23:41 +01:00
mach-mx25
mach-mxc91231
mach-netx
mach-nomadik ARM: 5786/1: Introduce plat-nomadik, MTU code re-organization 2009-11-28 10:22:51 +00:00
mach-ns9xxx
mach-omap1
mach-omap2 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2009-12-08 08:15:29 -08:00
mach-orion5x
mach-pnx4008
mach-pxa Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00
mach-realview
mach-rpc
mach-s3c24a0/include/mach ARM: S3C: Update Simtec copyright statements from , to - [2] 2009-12-01 01:33:51 +00:00
mach-s3c2400 ARM: S3C: Update Simtec copyright statements from , to - [2] 2009-12-01 01:33:51 +00:00
mach-s3c2410 ARM: Merge next-s3c24xx-dev-rtp 2009-12-03 21:33:01 +00:00
mach-s3c2412 ARM: S3C: Add NAND device platform data set call 2009-12-01 01:34:16 +00:00
mach-s3c2440 ARM: Merge next-s3c24xx-dev-rtp 2009-12-03 21:33:01 +00:00
mach-s3c2442 ARM: S3C: Add NAND device platform data set call 2009-12-01 01:34:16 +00:00
mach-s3c2443
mach-s3c6400 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-12-08 08:12:43 -08:00
mach-s3c6410 ARM: S3C64XX: add HSMMC2 support 2009-12-01 01:35:41 +00:00
mach-s5pc100 SMDKC100: add SDHCI controllers 0, 1 and 2 support 2009-12-01 01:33:18 +00:00
mach-sa1100 Merge branch 'for-lak' of git://git.linuxtogo.org/home/thesing/collie into sa1100 2009-12-06 16:53:12 +00:00
mach-shark
mach-stmp37xx
mach-stmp378x
mach-u300 Merge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' into devel 2009-12-05 10:35:18 +00:00
mach-ux500 ARM: 5832/1: ARM: U8500 Makefile.boot 2009-11-28 10:22:52 +00:00
mach-versatile
mach-w90x900 ARM: 5842/1: add spi resource support for nuc900 2009-12-01 23:08:31 +00:00
mm Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00
nwfpe
oprofile
plat-iop
plat-mxc Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable 2009-12-04 17:34:50 +00:00
plat-nomadik ARM: 5833/1: ARM nomadik: enable U8500 for common platform 2009-11-28 10:22:53 +00:00
plat-omap Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2009-12-08 08:15:29 -08:00
plat-orion
plat-pxa pxa3xx_nand: move pxa3xx_nand.h common into plat directory 2009-12-01 09:02:43 +08:00
plat-s3c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-12-08 08:12:43 -08:00
plat-s3c24xx ARM: Merge next-s3c24xx-dev-rtp 2009-12-03 21:33:01 +00:00
plat-s3c64xx Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-12-08 08:12:43 -08:00
plat-s5pc1xx ARM: S5PC1xx: add platform helpers for SDHCI host controllers 2009-12-01 01:33:17 +00:00
plat-samsung ARM: SAMSUNG: Add plat-samsung as starting point for plat-s3c* moves 2009-12-01 01:28:37 +00:00
plat-stmp3xxx
tools [ARM] Update mach-types 2009-11-25 22:17:36 +00:00
vfp
Kconfig Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00
Kconfig-nommu
Kconfig.debug ARM: 5841/1: a driver for on-chip ETM and ETB 2009-12-02 10:25:22 +00:00
Makefile Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00