]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'arc-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Dec 2013 00:14:39 +0000 (16:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Dec 2013 00:14:39 +0000 (16:14 -0800)
Pull ARC fixes from Vineet Gupta:
 "These are couple of weeks old already, but I just couldn't get them to
  you earlier.

   - couple of fixes for recently added perf code
   - build time extable sort"

* tag 'arc-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: [perf] Fix a few thinkos
  ARC: Add guard macro to uapi/asm/unistd.h
  ARC: extable: Enable sorting at build time


Trivial merge