diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-16 02:39:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-16 02:39:32 +0200 |
| commit | a2c2df8672f55195f101d9251117aa59e358d296 (patch) | |
| tree | 72e7c3f035e890928624db5e08d77d697b8a872a /mm/swapfile.c | |
| parent | Merge tag 'nfs-for-3.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | [SCSI] Fix sd_probe_domain config problem (diff) | |
| download | linux-a2c2df8672f55195f101d9251117aa59e358d296.tar.xz linux-a2c2df8672f55195f101d9251117aa59e358d296.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is a couple of minor fixes, one for a preempt warning in the
mpt2sas driver and one is a config failure with the new sd async
domain."
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
[SCSI] Fix sd_probe_domain config problem
[SCSI] mpt2sas: Fix unsafe using smp_processor_id() in preemptible
Diffstat (limited to 'mm/swapfile.c')
0 files changed, 0 insertions, 0 deletions