From: Olof Johansson Date: Tue, 12 Feb 2013 23:32:31 +0000 (-0800) Subject: Merge tag 'omap-for-v3.9/am33xx-signed' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0a0db4a1e4c6dfd93411a4425b9f068f0da752c1;p=linux-beck.git Merge tag 'omap-for-v3.9/am33xx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/omap From Tony Lindgren: am33xx updates via Paul Walmsley : Fixes and IP block support for the TI AM33xx family of SoCs. These are prerequisites for power management and some PWM driver changes. Basic test logs are available from: http://www.pwsan.com/omap/testlogs/am33xx_fixes_a_3.9/20130208084835/ although it must be noted that I am unable to test these patches on AM33xx due to an unknown problem with v3.8-rc kernels: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg83525.html * tag 'omap-for-v3.9/am33xx-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3 ARM: OMAP2+: AM33XX: Update the hardreset API ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files ARM: OMAP2+: AM33XX: CM: Get rid of unnecessary header inclusions --- 0a0db4a1e4c6dfd93411a4425b9f068f0da752c1