diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 19:57:46 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 19:57:46 +0400 |
| commit | 9c317b3bed40fed07e2ed536afca3b58952ac432 (patch) | |
| tree | 9c3cc35a09cca665bdfcb85b1a1da37e221cc914 /arch/arm/plat-iop/cp6.c | |
| parent | 258e43fdb00c73d424b114ae3850accd55b27cbb (diff) | |
| parent | 859c965149ab5004b58b1fffd98190b6664cb717 (diff) | |
| download | linux-9c317b3bed40fed07e2ed536afca3b58952ac432.tar.xz | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/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
Diffstat (limited to 'arch/arm/plat-iop/cp6.c')
0 files changed, 0 insertions, 0 deletions