public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
linux/arch/arm/mach-omap2
History
Olof Johansson a5f17d1f4c Linux 3.3-rc2 
.. several days delayed. No reason, I just didn't think of it.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJPKF4KAAoJEHm+PkMAQRiGw/YH+wXg2DpZUuHeBK52zMGlJBPc
 DzX11/Uan3Y07gM0JbDzuVxwjX4vdxR2bV6r1qsLP8JEUnE8jyFC32DBGi5WAht7
 F4KU/Uov2Ds5/wzvY4Iuo01C+JftQHXuy/Sbhck1d0LI0yjLejRaw+zuJv0x2/eS
 7YqV+KTGE1lDuJs/Gyq1Vqr1g9831AuS1tv/g3gaqBuN6TcPBFCocaVxzwrUc+y6
 94h26XbbOhQRIz38oqUkiqAGnvYS61ocyBcEiRHf0dXkNSDIINqlgukvd7YTXouA
 jj/w/DWpMRcQuYAgqkrurr9+yWC9hVQcsvvQ5sAQnIPcxoR868sg1pO8Oheq+1g=
 =kUzV
 -----END PGP SIGNATURE-----

Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc

There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.

Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9g45.c
2012-02-07 15:05:20 -08:00
..
include/mach ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
board-2430sdp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-3430sdp.c power management changes for omap and imx 2012-01-09 14:39:59 -08:00
board-3630sdp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-4430sdp.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2012-01-14 15:11:19 -08:00
board-am3517crane.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-am3517evm.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
board-apollon.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-cm-t35.c Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
board-cm-t3517.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-devkit8000.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-flash.c
board-flash.h
board-generic.c power management changes for omap and imx 2012-01-09 14:39:59 -08:00
board-h4.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-igep0020.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-ldp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-n8x0.c power management changes for omap and imx 2012-01-09 14:39:59 -08:00
board-omap3beagle.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-omap3evm.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-omap3logic.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-omap3pandora.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-omap3stalker.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-omap3touchbook.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-omap4panda.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2012-01-14 15:11:19 -08:00
board-overo.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-rm680.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-rx51-peripherals.c Merge git://git.infradead.org/battery-2.6 2012-01-11 18:53:05 -08:00
board-rx51-video.c
board-rx51.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
board-ti8168evm.c Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
board-zoom-debugboard.c
board-zoom-display.c
board-zoom-peripherals.c
board-zoom.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
clkt2xxx_apll.c
clkt2xxx_dpll.c
clkt2xxx_dpllcore.c
clkt2xxx_osc.c
clkt2xxx_sys.c
clkt2xxx_virt_prcm_set.c
clkt34xx_dpll3m2.c
clkt_clksel.c
clkt_dpll.c
clkt_iclk.c
clock.c
clock.h
clock2xxx.c
clock2xxx.h
clock3xxx.c
clock3xxx.h
clock3xxx_data.c Driver specific changes 2012-01-09 14:39:22 -08:00
clock34xx.c
clock34xx.h
clock36xx.c
clock36xx.h
clock44xx.h
clock44xx_data.c Driver specific changes 2012-01-09 14:39:22 -08:00
clock2420_data.c
clock2430.c
clock2430_data.c
clock3517.c
clock3517.h
clock_common_data.c
clockdomain.c
clockdomain.h
clockdomain2xxx_3xxx.c
clockdomain44xx.c
clockdomains2xxx_3xxx_data.c
clockdomains3xxx_data.c
clockdomains44xx_data.c
clockdomains2420_data.c
clockdomains2430_data.c
cm-regbits-24xx.h
cm-regbits-34xx.h
cm-regbits-44xx.h
cm.h
cm1_44xx.h
cm2_44xx.h
cm2xxx_3xxx.c
cm2xxx_3xxx.h
cm44xx.c
cm44xx.h
cminst44xx.c
cminst44xx.h
common-board-devices.c
common-board-devices.h
common.c
common.h power management changes for omap and imx 2012-01-09 14:39:59 -08:00
control.c
control.h
cpuidle34xx.c Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart 2011-12-16 14:01:03 -08:00
cpuidle44xx.c
devices.c Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 2012-01-16 17:47:27 -08:00
devices.h
display.c Merge branch 'fbdev-next' of git://github.com/schandinat/linux-2.6 2012-01-14 15:11:19 -08:00
display.h
dma.c
dpll3xxx.c
dpll44xx.c
dsp.c
emu.c ARM: amba: omap2: use common amba device initializers 2012-01-26 19:59:28 +00:00
gpio.c
gpmc-nand.c
gpmc-onenand.c
gpmc-smc91x.c
gpmc-smsc911x.c
gpmc.c
hsmmc.c
hsmmc.h
hwspinlock.c
i2c.c
id.c
io.c Merge branch 'for_3.3/uart/runtime-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into uart 2011-12-16 14:01:03 -08:00
iommu2.c
irq.c
Kconfig ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs 2012-01-23 10:20:05 +00:00
mailbox.c
Makefile power management changes for omap and imx 2012-01-09 14:39:59 -08:00
Makefile.boot
mcbsp.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 2012-01-12 08:00:30 -08:00
mux.c ARM: OMAP2+: mux: add support for PAD wakeup interrupts 2011-12-16 14:36:59 -07:00
mux.h
mux34xx.c
mux34xx.h
mux44xx.c
mux44xx.h
mux2420.c
mux2420.h
mux2430.c
mux2430.h
omap-headsmp.S
omap-hotplug.c
omap-iommu.c
omap-mpuss-lowpower.c
omap-secure.c ARM: Add arm_memblock_steal() to allocate memory away from the kernel 2012-01-13 15:02:35 +00:00
omap-smc.S
omap-smp.c
omap-wakeupgen.c
omap4-common.c ARM: Add arm_memblock_steal() to allocate memory away from the kernel 2012-01-13 15:02:35 +00:00
omap4-sar-layout.h
omap_hwmod.c power management changes for omap and imx 2012-01-09 14:39:59 -08:00
omap_hwmod_2xxx_3xxx_interconnect_data.c
omap_hwmod_2xxx_3xxx_ipblock_data.c
omap_hwmod_2xxx_interconnect_data.c
omap_hwmod_2xxx_ipblock_data.c
omap_hwmod_3xxx_data.c ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C 2011-12-16 01:34:46 -07:00
omap_hwmod_44xx_data.c ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C 2011-12-16 01:34:46 -07:00
omap_hwmod_2420_data.c
omap_hwmod_2430_data.c
omap_hwmod_common_data.c
omap_hwmod_common_data.h
omap_l3_noc.c
omap_l3_noc.h
omap_l3_smx.c
omap_l3_smx.h
omap_opp_data.h
omap_phy_internal.c
omap_twl.c
opp.c
opp2xxx.h
opp3xxx_data.c
opp4xxx_data.c
opp2420_data.c
opp2430_data.c
pm-debug.c
pm.c Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD 2012-01-05 12:55:03 +00:00
pm.h
pm24xx.c ARM: OMAP: convert idle handlers from pm_idle to arm_pm_idle 2012-01-20 18:55:06 -05:00
pm34xx.c ARM: OMAP: convert idle handlers from pm_idle to arm_pm_idle 2012-01-20 18:55:06 -05:00
pm44xx.c ARM: substitute arch_idle() 2012-01-20 18:55:19 -05:00
powerdomain-common.c
powerdomain.c
powerdomain.h
powerdomain2xxx_3xxx.c
powerdomain44xx.c
powerdomains2xxx_3xxx_data.c
powerdomains2xxx_3xxx_data.h
powerdomains2xxx_data.c
powerdomains3xxx_data.c
powerdomains44xx_data.c
prcm-common.h power management changes for omap and imx 2012-01-09 14:39:59 -08:00
prcm.c ARM: restart: omap: use new restart hook 2012-01-05 12:57:16 +00:00
prcm44xx.h
prcm_mpu44xx.c
prcm_mpu44xx.h
prm-regbits-24xx.h
prm-regbits-34xx.h
prm-regbits-44xx.h
prm.h
prm2xxx_3xxx.c Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into prcm 2011-12-16 14:00:23 -08:00
prm2xxx_3xxx.h ARM: OMAP: PRCM: add suspend prepare / finish support 2011-12-16 14:36:58 -07:00
prm44xx.c Merge branch 'tk_prm_chain_handler_devel_3.3' of git://git.pwsan.com/linux-2.6 into prcm 2011-12-16 14:00:23 -08:00
prm44xx.h ARM: OMAP: PRCM: add suspend prepare / finish support 2011-12-16 14:36:58 -07:00
prm_common.c ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
prminst44xx.c
prminst44xx.h
scrm44xx.h
sdram-hynix-h8mbx00u0mer-0em.h
sdram-micron-mt46h32m32lf-6.h
sdram-nokia.c
sdram-nokia.h
sdram-numonyx-m65kxxxxam.h
sdram-qimonda-hyb18m512160af-6.h
sdrc.c
sdrc.h
sdrc2xxx.c
serial.c ARM: OMAP2+: UART: Remove omap_uart_can_sleep and add pm_qos 2011-12-14 16:05:26 -08:00
sleep24xx.S
sleep34xx.S
sleep44xx.S
smartreflex-class3.c
smartreflex.c Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD 2012-01-05 12:55:03 +00:00
smartreflex.h
sr_device.c
sram34xx.S
sram242x.S
sram243x.S
timer-mpu.c
timer.c ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime 2011-12-18 23:00:26 +00:00
twl-common.c
twl-common.h
usb-fs.c
usb-host.c ARM: OMAP: USB: register hwmods of usbhs 2011-12-16 04:26:29 -07:00
usb-musb.c
usb-tusb6010.c
vc.c
vc.h
vc3xxx_data.c
vc44xx_data.c
voltage.c
voltage.h
voltagedomains2xxx_data.c
voltagedomains3xxx_data.c Non-critical bug fixes 2012-01-09 14:20:39 -08:00
voltagedomains44xx_data.c
vp.c
vp.h
vp3xxx_data.c
vp44xx_data.c
wd_timer.c
wd_timer.h