From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jun 2011 15:57:46 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: firefly_0821_release~3680^2~5183
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9c317b3bed40fed07e2ed536afca3b58952ac432;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git390.marist.edu/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] allow setting of upper 32 bit in smp_ctl_set_bit
  [S390] hwsampler: Set a sane default sampling rate
  [S390] s390: enforce HW limits for the initial sampling rate
  [S390] kvm-s390: fix kconfig dependencies
---

9c317b3bed40fed07e2ed536afca3b58952ac432