Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 08:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
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 Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 2009-09-19 13:47:57 +01:00
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 ASoC: DaVinci: pcm, fix underrun by using sram 2009-11-19 10:48:08 +00:00
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 Gemini: Fix SRAM/ROM location after memory swap 2009-05-28 16:42:25 +03:00
mach-h720x
mach-integrator ARM: integrator: allow Integrator to be built with highmem 2009-10-25 22:44:30 +00:00
mach-iop13xx Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00
mach-iop32x iop: enable generic time 2009-10-29 11:46:55 -07:00
mach-iop33x iop: enable generic time 2009-10-29 11:46:55 -07:00
mach-ixp4xx ixp4xx: arch_idle() documentation fixup 2009-09-21 19:20:03 +02:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood [ARM] Kirkwood: Remove code duplication in QNAP setup files 2009-11-13 12:14:24 -05:00
mach-ks8695 ARM: dma-mapping: provide dma_to_page() 2009-11-23 12:53:54 +00:00
mach-l7200
mach-lh7a40x
mach-loki [ARM] add coherent DMA mask for mv643xx_eth 2009-05-22 17:05:53 -04:00
mach-mmp [ARM] pxa: add apmu clock support in mmp 2009-12-01 09:02:51 +08:00
mach-msm
mach-mv78xx0 [ARM] properly report mv78100 stepping A1 2009-11-05 23:03:19 -05:00
mach-mx1 ARM: mxc: Fix i2c_board_info definitions 2009-08-14 12:40:37 +02:00
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 mx25: Add missing copyright / license header 2009-10-02 09:14:18 +02:00
mach-mxc91231 MXC: add iomux pins configuration support for MXC91231 2009-08-14 12:40:47 +02:00
mach-netx netx: Use get_irqnr_preamble to initialize base register 2009-08-13 20:34:36 +02:00
mach-nomadik ARM: 5786/1: Introduce plat-nomadik, MTU code re-organization 2009-11-28 10:22:51 +00:00
mach-ns9xxx const: constify remaining file_operations 2009-10-01 16:11:11 -07:00
mach-omap1 omap1: Add board support and LCD for HTC Herald 2009-11-22 10:24:33 -08:00
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 [ARM] orion5x: Add LaCie NAS 2Big Network support 2009-09-08 14:10:35 -04:00
mach-pnx4008
mach-pxa Merge branch 'devel-stable' into devel 2009-12-05 10:35:33 +00:00
mach-realview RealView: Add sparsemem support for the RealView PBX platform 2009-11-05 10:10:36 +00:00
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 [ARM] 5539/1: Freescale STMP: onboard devices declaration 2009-06-04 14:16:45 +01:00
mach-stmp378x [ARM] 5539/1: Freescale STMP: onboard devices declaration 2009-06-04 14:16:45 +01:00
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 ARM: 5720/1: Move MMCI header to amba include dir 2009-09-22 20:49:04 +01:00
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 ARM: 5764/1: bcmring: add oprofile pmu support 2009-10-17 20:10:22 +01:00
plat-iop iop: implement sched_clock() 2009-10-29 11:46:56 -07:00
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 [ARM] Kirkwood: __init requires linux/init.h 2009-08-24 11:55:59 -04:00
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 ARM: STMP3xxx: deallocation with negative index of descriptors[] 2009-09-19 12:14:05 +01:00
tools [ARM] Update mach-types 2009-11-25 22:17:36 +00:00
vfp Thumb-2: Implement the unified VFP support 2009-07-24 12:32:57 +01:00
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