]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Apr 2012 18:08:20 +0000 (11:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Apr 2012 18:08:20 +0000 (11:08 -0700)
commit70f33fa5863458ec9f1ae3aabdb9c2401598ec3d
treecab932fad832093ab383f291aab82b1b0f3593e9
parenta1ada086062101533eb0f841d3884137688091ec
parente72d5c7e9c831f6e393c71dcd62acafbac2b58d0
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull arch/tile fixes from Chris Metcalf:
 "This is one important change from Srivatsa Bhat that got dropped when
  I put together my pull request for -rc2, plus a trivial change to
  remove a compiler warning."

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: avoid unused variable warning in proc.c for tilegx
  tile/CPU hotplug: Add missing call to notify_cpu_starting()