Linus Torvalds
0df0914d41
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: (258 commits)
omap: zoom: host should not pull up wl1271's irq line
arm: plat-omap: iommu: fix request_mem_region() error path
OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
omap4: mux: Remove duplicate mux modes
omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
omap4: board-omap4panda: Initialise the serial pads
omap3: board-3430sdp: Initialise the serial pads
omap4: board-4430sdp: Initialise the serial pads
omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
omap2+: mux: Remove the use of IDLE flag
omap2+: Add separate list for dynamic pads to mux
perf: add OMAP support for the new power events
OMAP4: Add IVA OPP enteries.
OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
OMAP3+: OPP: Replace voltage values with Macros
OMAP3: wdtimer: Fix CORE idle transition
Watchdog: omap_wdt: add fine grain runtime-pm
...
Fix up various conflicts in
- arch/arm/mach-omap2/board-omap3evm.c
- arch/arm/mach-omap2/clock3xxx_data.c
- arch/arm/mach-omap2/usb-musb.c
- arch/arm/plat-omap/include/plat/usb.h
- drivers/usb/musb/musb_core.h
2011-03-17 19:28:15 -07:00
..
boot
Merge branch 'v6v7' into devel
2011-03-16 23:35:26 +00:00
common
Merge branch 'misc' into devel
2011-03-16 23:35:25 +00:00
configs
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
2011-03-17 19:28:15 -07:00
include /asm
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
kernel
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
lib
mach-at91
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-bcmring
mach-clps711x
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-16 19:03:06 -07:00
mach-cns3xxx
mach-davinci
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-dove
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-ebsa110
mach-ep93xx
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-exynos4
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-footbridge
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-gemini
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-h720x
mach-imx
arm: imx: Zero entire imxdma structure
2011-03-10 14:24:53 +01:00
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-ks8695
mach-l7200/include /mach
mach-loki
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-lpc32xx
mach-mmp
mach-msm
Merge remote branch 'rmk/for-linus' into for-linus
2011-03-16 22:13:16 -07:00
mach-mv78xx0
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-mx3
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-mx5
ARM: imx5x: clean up ARCH_MX5X
2011-03-07 19:29:42 +01:00
mach-mxc91231
ARM: mxc91231/iomux: allow pin_list to be const
2011-03-07 19:29:28 +01:00
mach-mxs
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-netx
mach-nomadik
mach-ns9xxx
mach-nuc93x
mach-omap1
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
2011-03-17 19:28:15 -07:00
mach-omap2
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
2011-03-17 19:28:15 -07:00
mach-orion5x
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-pnx4008
mach-pxa
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-realview
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-rpc
mach-s3c24a0/include /mach
mach-s3c64xx
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-s3c2400
mach-s3c2410
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-16 19:03:06 -07:00
mach-s3c2412
ARM: s3c24xx: Switch to common GPIO controlled UDC pullup implementation
2011-03-07 12:23:22 -08:00
mach-s3c2416
mach-s3c2440
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-s3c2443
mach-s5p64x0
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-s5p6442
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-s5pc100
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-s5pv210
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-sa1100
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-shark
mach-shmobile
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
mach-spear3xx
ARM: 6794/1: SPEAr: Append UL to device address macros.
2011-03-09 09:50:04 +00:00
mach-spear6xx
ARM: 6794/1: SPEAr: Append UL to device address macros.
2011-03-09 09:50:04 +00:00
mach-stmp37xx
mach-stmp378x
mach-tcc8k
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-tegra
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-16 19:03:06 -07:00
mach-u300
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-ux500
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
mach-versatile
mach-vexpress
mach-vt8500
mach-w90x900
mm
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
nwfpe
oprofile
plat-iop
plat-mxc
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
plat-nomadik
plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
2011-03-14 14:05:17 +01:00
plat-omap
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
2011-03-17 19:28:15 -07:00
plat-orion
ARM: Remove dependency of plat-orion GPIO code on mach directory includes.
2011-03-03 16:27:02 -05:00
plat-pxa
plat-s3c24xx
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
plat-s5p
ARM: EXYNOS4: Implement Clock gating for System MMU
2011-03-15 21:37:38 +09:00
plat-samsung
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00
plat-spear
Merge branch 'p2v' into devel
2011-03-16 23:35:27 +00:00
plat-stmp3xxx
plat-tcc
plat-versatile
tools
vfp
Kconfig
Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm
2011-03-17 19:13:18 -07:00
Kconfig-nommu
Kconfig.debug
Makefile
Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-17 19:08:06 -07:00