Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
commit9c317b3bed40fed07e2ed536afca3b58952ac432
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 15:57:46 +0000 (27 08:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 15:57:46 +0000 (27 08:57 -0700)
tree9c3cc35a09cca665bdfcb85b1a1da37e221cc914
parent258e43fdb00c73d424b114ae3850accd55b27cbb
parent859c965149ab5004b58b1fffd98190b6664cb717
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