1. 30 Nov, 2012 1 commit
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.8/cleanup-timer-signed' of... · c8a1cecc
      Olof Johansson authored
      Merge tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
      
      Timer clean-up to get us closer to moving timer code to drivers,
      and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
      or devicetree provided timer configuration.
      
      Note that these changes are on top of the recent timer fixes.
      
      By Jon Hunter (32) and others
      via Tony Lindgren
      * tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (71 commits)
        ARM: OMAP3: cm-t3517: use GPTIMER for system clock
        ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
        ARM: OMAP2+: Fix compiler warning for 32k timer
        ARM: OMAP: Remove unnecessary inclusion of dmtimer.h
        ARM: OMAP: Add platform data header for DMTIMERs
        ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration
        ARM: OMAP2+: Remove unnecessary local variable in timer code
        ARM: OMAP: Don't store timers physical address
        ARM: OMAP: Define omap_dm_timer_prepare function as static
        ARM: OMAP: Clean-up dmtimer reset code
        ARM: OMAP: Remove __omap_dm_timer_set_source function
        ARM: OMAP: Remove unnecessary call to clk_get()
        ARM: OMAP: Add dmtimer interrupt disable function
        ARM: OMAP: Fix spurious interrupts when using timer match feature
        ARM: OMAP: Don't restore DMTIMER interrupt status register
        ARM: OMAP: Don't restore of DMTIMER TISTAT register
        ARM: OMAP: Fix dmtimer reset for timer1
        ARM: OMAP2+: Don't use __omap_dm_timer_reset()
        ARM: OMAP2/3: Define HWMOD software reset status for DMTIMERs
        ARM: OMAP3: Correct HWMOD DMTIMER SYSC register declarations
        ...
      
      Change/change conflict in arch/arm/mach-omap2/board-cm-t3517.c.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c8a1cecc
  2. 26 Nov, 2012 6 commits
    • Arnd Bergmann's avatar
      Merge tag 'integrator-for-arm-soc' of... · 4c929c8a
      Arnd Bergmann authored
      Merge tag 'integrator-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup
      
      From Linus Walleij <linus.walleij@linaro.org>:
      
      This series will do the following:
      - Switch the Integrator/AP and /CP to use the SoC bus
        when booting from device tree.
      - Group all devices on the SoC below this bus so as to
        set a good example of how to do this. The bus was
        invented by Lee Jones, let's show how it's to be used
        on a DT:ed SoC.
      - Fetch the special system controller offsets from two
        special device tree nodes for each case and replace
        the static mappings with these at boot.
      - Move some static remaps to the ATAG-only code path
        and delete some static maps that aren't used.
      - Push dependencies on system controller remaps down
        to the Integrator/AP board file and the PCIv3 driver
        respectively and use only dynamic remappings.
      - Fix up conditional BUG() usage in the PCIv3 driver
        to be simpler and more to the point.
      
      * tag 'integrator-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
        ARM: integrator: use BUG_ON where possible
        ARM: integrator: push down SC dependencies
        ARM: integrator: delete static UART1 mapping
        ARM: integrator: delete SC mapping on the CP
        ARM: integrator: remove static CP syscon mapping
        ARM: integrator: remove static AP syscon mapping
        ARM: integrator: hook the CP into the SoC bus
        ARM: integrator: hook the AP into the SoC bus
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      4c929c8a
    • Olof Johansson's avatar
      Merge tag 'orion_cleanup_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/cleanup · d98eb5cf
      Olof Johansson authored
      From Jason Cooper:
      orion cleanup for v3.8
      
       - remove unused includes in kirkwood
       - fix sparse warnings in kirkwood
       - checkpatch cleanup in kirkwood
       - use common code in pcie on kirkwood
      
      * tag 'orion_cleanup_for_3.8' of git://git.infradead.org/users/jcooper/linux:
        ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
        ARM: Kirkwood: checkpatch cleanups
        ARM: Kirkwood: Fix sparse warnings.
        ARM: Kirkwood: Remove unused includes
        ARM: kirkwood: cleanup lsxl board includes
      d98eb5cf
    • Olof Johansson's avatar
      Merge tag 'v3.7-rc7' into next/cleanup · 0f9cb211
      Olof Johansson authored
      Merging in mainline back to next/cleanup since it has collected a few
      conflicts between fixes going upstream and some of the cleanup patches.
      Git doesn't auto-resolve some of them, and they're mostly noise so let's
      take care of it locally.
      
      Conflicts are in:
      	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
      	arch/arm/plat-omap/i2c.c
      	drivers/video/omap2/dss/dss.c
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0f9cb211
    • Linus Torvalds's avatar
      Linux 3.7-rc7 · 9489e9dc
      Linus Torvalds authored
      9489e9dc
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 08e627b5
      Linus Torvalds authored
      Pull powerpc EEH bugfixes from Benjamin Herrenschmidt.
      
      Two one-liner fixes for the new EEH code.
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/eeh: Do not invalidate PE properly
        powerpc/pseries: Fix oops with MSIs when missing EEH PEs
      08e627b5
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · c2a65d3d
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Three issues fixed accross the field:
      
         - Some functions that were recently outlined as part of a preemption
           fix were causing problems with function tracing.
         - The recently merged in-kernel MPI library uses very outdated
           headers that contain MIPS-specific code which won't build on with
           gcc 4.4 or newer.
         - The MIPS non-NUMA memory initialization was making only a very
           half-baked attempt at merging adjacent memory ranges.  This kept
           the code simple enough but is now causing issues with kexec."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MPI: Fix compilation on MIPS with GCC 4.4 and newer
        MIPS: Fix crash that occurs when function tracing is enabled
        MIPS: Merge overlapping bootmem ranges
      c2a65d3d
  3. 25 Nov, 2012 1 commit
  4. 24 Nov, 2012 4 commits
    • Linus Torvalds's avatar
      Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 194d9831
      Linus Torvalds authored
      Pull sound build error fix from Takashi Iwai:
       "Only a single commit for fixing the build error without CONFIG_PM in
        hda driver."
      
      * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Fix build without CONFIG_PM
      194d9831
    • Takashi Iwai's avatar
      ALSA: hda - Fix build without CONFIG_PM · d846b174
      Takashi Iwai authored
      I forgot this again...  codec->in_pm is in #ifdef CONFIG_PM
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      d846b174
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2654ad44
      Linus Torvalds authored
      Pull x86 arch fixes from Peter Anvin:
       "Here is a collection of fixes for 3.7-rc7.  This is a superset of
        tglx' earlier pull request."
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64: Fix ordering of CFI directives and recent ASM_CLAC additions
        x86, microcode, AMD: Add support for family 16h processors
        x86-32: Export kernel_stack_pointer() for modules
        x86-32: Fix invalid stack address while in softirq
        x86, efi: Fix processor-specific memcpy() build error
        x86: remove dummy long from EFI stub
        x86, mm: Correct vmflag test for checking VM_HUGETLB
        x86, amd: Disable way access filter on Piledriver CPUs
        x86/mce: Do not change worker's running cpu in cmci_rediscover().
        x86/ce4100: Fix PCI configuration register access for devices without interrupts
        x86/ce4100: Fix reboot by forcing the reboot method to be KBD
        x86/ce4100: Fix pm_poweroff
        MAINTAINERS: Update email address for Robert Richter
        x86, microcode_amd: Change email addresses, MAINTAINERS entry
        MAINTAINERS: Change Boris' email address
        EDAC: Change Boris' email address
        x86, AMD: Change Boris' email address
      2654ad44
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6 · 35f95d22
      Linus Torvalds authored
      Pull MTD fixes from David Woodhouse:
       "The most important part of this is that it fixes a regression in
        Samsung NAND chip detection, introduced by some rework which went into
        3.7.  The initial fix wasn't quite complete, so it's in two parts.  In
        fact the first part is committed twice (Artem committed his own copy
        of the same patch) and I've merged Artem's tree into mine which
        already had that fix.
      
        I'd have recommitted that to make it somewhat cleaner, but figured by
        this point in the release cycle it was better to merge *exactly* the
        commits which have been in linux-next.
      
        If I'd recommitted, I'd also omit the sparse warning fix.  But it's
        there, and it's harmless — just marking one function as 'static' in
        onenand code.
      
        This also includes a couple more fixes for stable: an AB-BA deadlock
        in JFFS2, and an invalid range check in slram."
      
      * tag 'for-linus-20121123' of git://git.infradead.org/mtd-2.6:
        mtd: nand: fix Samsung SLC detection regression
        mtd: nand: fix Samsung SLC NAND identification regression
        jffs2: Fix lock acquisition order bug in jffs2_write_begin
        mtd: onenand: Make flexonenand_set_boundary static
        mtd: slram: invalid checking of absolute end address
        mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()
        mtd: nand: fix Samsung SLC NAND identification regression
      35f95d22
  5. 23 Nov, 2012 28 commits