1. 17 Sep, 2012 3 commits
  2. 16 Sep, 2012 1 commit
  3. 13 Sep, 2012 8 commits
  4. 12 Sep, 2012 6 commits
  5. 08 Sep, 2012 5 commits
  6. 06 Sep, 2012 4 commits
  7. 05 Sep, 2012 10 commits
  8. 04 Sep, 2012 2 commits
    • Arnd Bergmann's avatar
      Merge branch 'cleanup/io-pci' into next/cleanup · 3fbb96d2
      Arnd Bergmann authored
      The io-pci series has gained a merge to resolve a nontrivial
      conflict.
      
      * cleanup/io-pci:
        ARM: Fix ioremap() of address zero
      
      Also includes an update to Linux 3.6-rc3
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      3fbb96d2
    • Arnd Bergmann's avatar
      Merge commit 'a849088a' from rmk/fixes into cleanup/io-pci · 863e99a8
      Arnd Bergmann authored
      As Stephen Rothwell reports, a849088a ("ARM: Fix ioremap() of
      address zero") from the arm-current tree and commit c2794437 ("ARM:
      Add fixed PCI i/o mapping") from the arm-soc tree conflict in
      a nontrivial way in arch/arm/mm/mmu.c.
      
      Rob Herring explains:
      The PCI i/o reserved area has a dummy physical address of 0 and
      needs to be skipped by ioremap searches. So we don't set
      VM_ARM_STATIC_MAPPING to prevent matches by ioremap. The vm_struct
      settings don't really matter when we do the real mapping of the
      i/o space.
      
      Since commit a849088a is at the start of the fixes branch
      in the arm tree, we can merge it into the branch that contains
      the other ioremap changes.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Cc: Rob Herring <rob.herring@calxeda.com>
      Cc: Russell King <rmk+kernel@arm.linux.org.uk>
      863e99a8
  9. 01 Sep, 2012 1 commit