diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 17:57:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 17:57:46 +0200 |
| commit | 9c317b3bed40fed07e2ed536afca3b58952ac432 (patch) | |
| tree | 9c3cc35a09cca665bdfcb85b1a1da37e221cc914 /arch/arm/mm/proc-v7.S | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | [S390] allow setting of upper 32 bit in smp_ctl_set_bit (diff) | |
| download | linux-9c317b3bed40fed07e2ed536afca3b58952ac432.tar.xz linux-9c317b3bed40fed07e2ed536afca3b58952ac432.zip | |
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/mm/proc-v7.S')
0 files changed, 0 insertions, 0 deletions