Linus Torvalds 075cb105cb Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap ... * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (31 commits) ARM: OMAP: Fix export.h or module.h includes ARM: OMAP: omap_device: Include linux/export.h ARM: OMAP2: Fix H4 matrix keyboard warning ARM: OMAP1: Remove unused omap-alsa.h ARM: OMAP1: Fix warnings about enabling 32 KiHz timer ARM: OMAP2+: timer: Remove omap_device_pm_latency ARM: OMAP2+: clock data: Remove redundant timer clkdev ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio ARM: OMAP: usb: musb: OMAP: Delete unused function MAINTAINERS: Update linux-omap git repository ARM: OMAP: change get_context_loss_count ret value to int ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success ARM: OMAP: dmtimer: Include linux/module.h ARM: OMAP2+: l3-noc: Include linux/module.h ARM: OMAP2+: devices: Fixes for McPDM ARM: OMAP: Fix errors and warnings when building for one board ARM: OMAP3: PM: restrict erratum i443 handling to OMAP3430 only ...		2011-11-07 16:14:26 -08:00
..
include/mach	Merge branch 'prcm_scm_misc_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes	2011-11-04 17:39:41 -07:00
board-2430sdp.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-3430sdp.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-3630sdp.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-4430sdp.c	Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 19:55:06 -07:00
board-am3517crane.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-am3517evm.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-apollon.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-cm-t35.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-cm-t3517.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-devkit8000.c	ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio	2011-11-04 18:07:10 -07:00
board-flash.c	ARM: OMAP2+: Fix missing inline functions for Makefile cleanup	2011-09-20 15:57:39 -07:00
board-flash.h	ARM: OMAP2+: Fix missing inline functions for Makefile cleanup	2011-09-20 15:57:39 -07:00
board-generic.c	ARM: OMAP: Fix errors and warnings when building for one board	2011-11-04 17:41:06 -07:00
board-h4.c	ARM: OMAP2: Fix H4 matrix keyboard warning	2011-11-04 18:07:21 -07:00
board-igep0020.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-ldp.c	Merge branch 'highbank/soc' into next/soc	2011-11-02 02:46:10 +01:00
board-n8x0.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-omap3beagle.c	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
board-omap3evm.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
board-omap3logic.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-omap3pandora.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-omap3stalker.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-omap3touchbook.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-omap4panda.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-overo.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-rm680.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-rx51-peripherals.c	ASoC: tpa6130a2: Remove model_id from platform data	2011-09-21 16:07:45 +01:00
board-rx51-video.c
board-rx51.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-ti8168evm.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01:00
board-zoom-debugboard.c
board-zoom-display.c
board-zoom-peripherals.c
board-zoom.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 13:47:27 +01: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	ARM: OMAP3+: Update DPLL Fint range for OMAP36xx and OMAP4xxx devices	2011-10-07 01:44:20 -06:00
clkt_iclk.c
clock2xxx.c
clock2xxx.h
clock3xxx_data.c	ARM: OMAP2+: clock data: Remove redundant timer clkdev	2011-11-04 18:07:11 -07:00
clock3xxx.c
clock3xxx.h
clock34xx.c
clock34xx.h
clock36xx.c
clock36xx.h
clock44xx_data.c	ARM: OMAP2+: clock data: Remove redundant timer clkdev	2011-11-04 18:07:11 -07:00
clock44xx.h	ARM: OMAP4: clock: round_rate and recalc functions for DPLL_ABE	2011-10-07 00:52:58 -06:00
clock2420_data.c	ARM: OMAP2+: clock data: Remove redundant timer clkdev	2011-11-04 18:07:11 -07:00
clock2430_data.c	ARM: OMAP2+: clock data: Remove redundant timer clkdev	2011-11-04 18:07:11 -07:00
clock2430.c
clock3517.c
clock3517.h
clock_common_data.c
clock.c
clock.h	ARM: OMAP4: clock: round_rate and recalc functions for DPLL_ABE	2011-10-07 00:52:58 -06:00
clockdomain2xxx_3xxx.c	OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain	2011-09-14 16:01:21 -06:00
clockdomain44xx.c	OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain	2011-09-14 16:01:21 -06:00
clockdomain.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
clockdomain.h	OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain	2011-09-14 16:01:21 -06:00
clockdomains2xxx_3xxx_data.c	OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain	2011-09-14 16:01:21 -06:00
clockdomains3xxx_data.c	OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain	2011-09-14 16:01:21 -06:00
clockdomains44xx_data.c	OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain	2011-09-14 16:01:21 -06:00
clockdomains2420_data.c	OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain	2011-09-14 16:01:21 -06:00
clockdomains2430_data.c	OMAP: clockdomain code/data: remove omap_chip bitmask from struct clockdomain	2011-09-14 16:01:21 -06:00
cm1_44xx.h
cm2_44xx.h
cm2xxx_3xxx.c
cm2xxx_3xxx.h
cm44xx.c
cm44xx.h
cm-regbits-24xx.h
cm-regbits-34xx.h
cm-regbits-44xx.h
cm.h
cminst44xx.c
cminst44xx.h
common-board-devices.c
common-board-devices.h
common.c	ARM: OMAP: Move set_globals initialization to happen in init_early	2011-10-19 16:34:11 -07:00
control.c	ARM: OMAP: Move set_globals initialization to happen in init_early	2011-10-19 16:34:11 -07:00
control.h
cpuidle34xx.c	cpuidle: Single/Global registration of idle states	2011-11-06 21:13:58 -05:00
devices.c	ARM: OMAP2+: devices: Fixes for McPDM	2011-11-04 17:41:06 -07:00
devices.h
display.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
dma.c	ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures	2011-10-04 09:52:23 -07:00
dpll3xxx.c	ARM: OMAP3+: dpll: use DPLLs recalc function instead of omap2_get_dpll_rate	2011-10-07 01:01:22 -06:00
dpll44xx.c	ARM: OMAP4: clock: round_rate and recalc functions for DPLL_ABE	2011-10-07 00:52:58 -06:00
dsp.c	ARM: OMAP: Fix export.h or module.h includes	2011-11-07 12:27:10 -08:00
emu.c
gpio.c	ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures	2011-10-04 09:52:23 -07:00
gpmc-nand.c
gpmc-onenand.c	arm: fix implicit memset/string.h usage in various arch/arm files	2011-10-31 19:30:45 -04:00
gpmc-smc91x.c
gpmc-smsc911x.c
gpmc.c
hsmmc.c	ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly	2011-11-04 17:41:07 -07:00
hsmmc.h
hwspinlock.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock	2011-11-03 08:05:35 -07:00
i2c.c
id.c	Merge branch 'for_3.2/pm-cleanup-2' of git://github.com/khilman/linux-omap-pm into fixes	2011-11-04 17:40:52 -07:00
io.c	ARM: OMAP: Fix errors and warnings when building for one board	2011-11-04 17:41:06 -07:00
io.h	ARM: OMAP: Map SRAM later on with ioremap_exec()	2011-10-19 16:34:10 -07:00
iommu2.c	omap: iommu: omapify 'struct iommu' and exposed API	2011-08-26 11:46:01 +02:00
irq.c	ARM: OMAP: irq: loop counter fix in omap_init_irq()	2011-10-03 11:46:49 -07:00
Kconfig	Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6	2011-11-03 09:40:51 -07:00
mailbox.c	ARM: OMAP: Fix export.h or module.h includes	2011-11-07 12:27:10 -08:00
Makefile	Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:22:01 -07:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mcbsp.c	ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures	2011-10-04 09:52:23 -07:00
mux34xx.c
mux34xx.h
mux44xx.c
mux44xx.h
mux2420.c
mux2420.h
mux2430.c
mux2430.h
mux.c
mux.h
omap4-common.c
omap44xx-smc.S
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: fix variant registration and remove SmartReflex from common list	2011-11-04 17:41:07 -07:00
omap_hwmod_44xx_data.c	Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:18:05 -07:00
omap_hwmod_2420_data.c	ARM: OMAP2+: dmtimer: convert to platform devices	2011-09-21 15:50:31 -07:00
omap_hwmod_2430_data.c	ARM: OMAP2+: dmtimer: convert to platform devices	2011-09-21 15:50:31 -07:00
omap_hwmod_common_data.c
omap_hwmod_common_data.h
omap_hwmod.c	ARM: OMAP: change get_context_loss_count ret value to int	2011-11-04 17:41:07 -07:00
omap_l3_noc.c	ARM: OMAP2+: l3-noc: Include linux/module.h	2011-11-04 17:41:06 -07:00
omap_l3_noc.h	OMAP: Print Initiator name for l3 custom error.	2011-09-24 13:28:57 +05:30
omap_l3_smx.c	OMAP: Fix indentation issues in l3 error handler.	2011-09-24 13:28:57 +05:30
omap_l3_smx.h	OMAP: Fix sparse warnings in l3 error handler.	2011-09-24 13:28:57 +05:30
omap_opp_data.h
omap_phy_internal.c
omap_twl.c	OMAP4: PM: TWL6030: add cmd register	2011-09-15 12:09:37 -07:00
omap-headsmp.S
omap-hotplug.c
omap-iommu.c	ARM: OMAP: Fix export.h or module.h includes	2011-11-07 12:27:10 -08:00
omap-smp.c	Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:58:25 -07:00
opp2xxx.h
opp3xxx_data.c
opp4xxx_data.c
opp2420_data.c
opp2430_data.c
opp.c	OMAP: omap_device: decouple platform_device from omap_device	2011-09-15 16:35:47 -07:00
pm24xx.c	OMAP2: PM debug: remove leftover debug code	2011-08-26 16:14:25 -07:00
pm34xx.c	Merge branch 'for_3.2/pm-cleanup-2' of git://github.com/khilman/linux-omap-pm into fixes	2011-11-04 17:40:52 -07:00
pm44xx.c
pm-debug.c
pm.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pm.h
powerdomain2xxx_3xxx.c	OMAP2: add voltage domains and connect to powerdomains	2011-09-15 11:39:10 -07:00
powerdomain44xx.c
powerdomain-common.c	OMAP: powerdomain: remove omap_chip bitmasks	2011-09-14 17:20:44 -06:00
powerdomain.c	ARM: OMAP: change get_context_loss_count ret value to int	2011-11-04 17:41:07 -07:00
powerdomain.h	ARM: OMAP: change get_context_loss_count ret value to int	2011-11-04 17:41:07 -07:00
powerdomains2xxx_3xxx_data.c	OMAP3: powerdomain data: add voltage domains	2011-09-15 11:39:10 -07:00
powerdomains2xxx_3xxx_data.h
powerdomains2xxx_data.c	OMAP2: add voltage domains and connect to powerdomains	2011-09-15 11:39:10 -07:00
powerdomains3xxx_data.c	OMAP3: powerdomain data: add voltage domains	2011-09-15 11:39:10 -07:00
powerdomains44xx_data.c	OMAP4: powerdomain data: add voltage domains	2011-09-15 11:39:10 -07:00
prcm44xx.h
prcm_mpu44xx.c
prcm_mpu44xx.h
prcm-common.h
prcm.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
prm2xxx_3xxx.c	OMAP2+: PRM: add register access functions for VC/VP	2011-09-15 12:02:07 -07:00
prm2xxx_3xxx.h	OMAP2+: PRM: add register access functions for VC/VP	2011-09-15 12:02:07 -07:00
prm44xx.c	OMAP2+: PRM: add register access functions for VC/VP	2011-09-15 12:02:07 -07:00
prm44xx.h	OMAP2+: PRM: add register access functions for VC/VP	2011-09-15 12:02:07 -07:00
prm-regbits-24xx.h
prm-regbits-34xx.h
prm-regbits-44xx.h
prm.h
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
sdrc2xxx.c
sdrc.c	ARM: OMAP: Move set_globals initialization to happen in init_early	2011-10-19 16:34:11 -07:00
sdrc.h
serial.c	ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures	2011-10-04 09:52:23 -07:00
sleep24xx.S
sleep34xx.S
smartreflex-class3.c	OMAP3+: voltage: rename omap_voltage_get_nom_volt -> voltdm_get_voltage	2011-09-15 12:09:21 -07:00
smartreflex.c	ARM: OMAP: Fix export.h or module.h includes	2011-11-07 12:27:10 -08:00
smartreflex.h
sr_device.c	Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:22:01 -07:00
sram34xx.S
sram242x.S
sram243x.S
timer-mpu.c
timer.c	ARM: OMAP2+: timer: Remove omap_device_pm_latency	2011-11-04 18:07:13 -07:00
twl-common.c	OMAP4: TWL: Add common omapdss supplies	2011-09-30 16:16:12 +03:00
twl-common.h
usb-fs.c
usb-host.c
usb-musb.c	ARM: OMAP: usb: musb: OMAP: Delete unused function	2011-11-04 18:07:08 -07:00
usb-tusb6010.c	arm: Add export.h to ARM specific files as required.	2011-10-31 19:30:50 -04:00
vc3xxx_data.c	OMAP2+: VC: more registers are per-channel starting with OMAP5	2011-09-15 12:09:22 -07:00
vc44xx_data.c	OMAP2+: VC: more registers are per-channel starting with OMAP5	2011-09-15 12:09:22 -07:00
vc.c	OMAP2+: VC: more registers are per-channel starting with OMAP5	2011-09-15 12:09:22 -07:00
vc.h	OMAP2+: VC: more registers are per-channel starting with OMAP5	2011-09-15 12:09:22 -07:00
voltage.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
voltage.h	ARM: OMAP: voltage: voltage layer present, even when CONFIG_PM=n	2011-09-21 09:36:21 -07:00
voltagedomains2xxx_data.c	OMAP2: add voltage domains and connect to powerdomains	2011-09-15 11:39:10 -07:00
voltagedomains3xxx_data.c	OMAP3+: voltdm: final removal of omap_vdd_info	2011-09-15 12:09:21 -07:00
voltagedomains44xx_data.c	OMAP3+: voltdm: final removal of omap_vdd_info	2011-09-15 12:09:21 -07:00
vp3xxx_data.c	OMAP: VP: Explicitly mask VPVOLTAGE field	2011-09-15 12:09:08 -07:00
vp44xx_data.c	OMAP: VP: Explicitly mask VPVOLTAGE field	2011-09-15 12:09:08 -07:00
vp.c	OMAP3+: VP: combine setting init voltage into common function	2011-09-15 12:09:08 -07:00
vp.h	OMAP3+: VP: remove unused omap_vp_get_curr_volt()	2011-09-15 12:09:08 -07:00
wd_timer.c
wd_timer.h