]> 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>
Mon, 7 Oct 2013 16:30:02 +0000 (09:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Oct 2013 16:30:02 +0000 (09:30 -0700)
commit4f97c9b206c4bf6ed5ad31091ec2eb9c2204e44c
treefe5e840595303db13e742f968d6ee8682cb97fc2
parent162bdafa46bfbc10c564de3c1aca2708440181e8
parent0cc96a745059e8daf1d7d6a26672f0ad9056e989
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

Pull Tile bugfixes from Chris Metcalf:
 "This fixes some serious issues with PREEMPT support, and a couple of
  smaller corner-case issues fixed in the last couple of weeks"

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch: tile: re-use kbasename() helper
  tile: use a more conservative __my_cpu_offset in CONFIG_PREEMPT
  tile: ensure interrupts disabled for preempt_schedule_irq()
  tile: change lock initalization in hardwall
  tile: include: asm: use 'long long' instead of 'u64' for atomic64_t and its related functions