• Linus Torvalds's avatar
    Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 4157368e
    Linus Torvalds authored
    Pull arch/tile bug fixes from Chris Metcalf:
     "This includes Paul Gortmaker's change to fix the <asm/system.h>
      disintegration issues on tile, a fix to unbreak the tilepro ethernet
      driver, and a backlog of bugfix-only changes from internal Tilera
      development over the last few months.
    
      They have all been to LKML and on linux-next for the last few days.
      The EDAC change to MAINTAINERS is an oddity but discussion on the
      linux-edac list suggested I ask you to pull that change through my
      tree since they don't have a tree to pull edac changes from at the
      moment."
    
    * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: (39 commits)
      drivers/net/ethernet/tile: fix netdev_alloc_skb() bombing
      MAINTAINERS: update EDAC information
      tilepro ethernet driver: fix a few minor issues
      tile-srom.c driver: minor code cleanup
      edac: say "TILEGx" not "TILEPro" for the tilegx edac driver
      ar...
    4157368e