From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Oct 2009 19:06:40 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: firefly_0821_release~12204
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ef790fe022916a225f7ba7fc565ffc51404655f7;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc: using HZ needs an include of linux/param.h
  sparc32: convert to asm-generic/hardirq.h
  sparc64: Cache per-cpu %pcr register value in perf code.
  sparc64: Fix comment typo in perf_event.c
  sparc64: Minor coding style fixups in perf code.
  sparc64: Add a basic conflict engine in preparation for multi-counter support.
  sparc64: Increase vmalloc size to fix percpu regressions.
  sparc64: Add initial perf event conflict resolution and checks.
  sparc: Niagara1 perf event support.
  sparc: Add Niagara2 HW cache event support.
  sparc: Support all ultra3 and ultra4 derivatives.
  sparc: Support HW cache events.
---

ef790fe022916a225f7ba7fc565ffc51404655f7