1. 30 Nov, 2012 1 commit
    • Olof Johansson's avatar
      Merge tag 'mvebu_everything_for_3.8' of git://git.infradead.org/users/jcooper/linux into late/mvebu · 0c0029cb
      Olof Johansson authored
      From Jason Cooper. Unfortunately this is a combined branch with all
      mvebu code as one drop, something we normally try to avoid and instead
      slice vendor topics across our branches. Hopefully we can avoid doing
      this again for 3.9!
      
      mvebu everything for v3.8
       - due to the complex interdependencies of the received pull requests
         I decided to keep this in one branch the way they recommended merging it
       - this was their first attempt at doing pull requests, we'll work on it
         with them
      
       - added SMP support for mvebu SoCs
       - added coherency fabric
       - added mdio and mvneta drivers
       - added mirabox board
       - added openblocks ax3-4 board
       - clock fixes and improvements
       - converted mv_xor driver to devicetree (extensive series in itself)
      
      * tag 'mvebu_everything_for_3.8' of git://git.infradead.org/users/jcooper/linux: (85 commits)
        dma: mv_xor: fix error handling path
        dma: mv_xor: fix error checking of irq_of_parse_and_map()
        dma: mv_xor: use request_irq() instead of devm_request_irq()
        dma: mv_xor: clear the window override control registers
        arm: mvebu: fix address decoding armada_cfg_base() function
        ARM: mvebu: update defconfig with I2C and RTC support
        ARM: mvebu: Add SATA support for OpenBlocks AX3-4
        ARM: mvebu: Add support for the RTC in OpenBlocks AX3-4
        ARM: mvebu: Add support for I2C on OpenBlocks AX3-4
        ARM: mvebu: Add support for I2C controllers in Armada 370/XP
        arm: mvebu: Add hardware I/O Coherency support
        arm: plat-orion: Add coherency attribute when setup mbus target
        arm: dma mapping: Export a dma ops function arm_dma_set_mask
        arm: mvebu: Add SMP support for Armada XP
        arm: mm: Add support for PJ4B cpu and init routines
        arm: mvebu: Add IPI support via doorbells
        arm: mvebu: Add initial support for power managmement service unit
        arm: mvebu: Add support for coherency fabric in mach-mvebu
        arm: mvebu: update defconfig to include XOR driver
        arm: mvebu: update defconfig to include network driver
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0c0029cb
  2. 26 Nov, 2012 3 commits
  3. 25 Nov, 2012 1 commit
  4. 24 Nov, 2012 5 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
    • Jason Cooper's avatar
      Merge branch 'mvebu-misc-fixes' of... · 56580bb4
      Jason Cooper authored
      Merge branch 'mvebu-misc-fixes' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
      56580bb4
    • 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 30 commits