diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 08:04:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-19 08:04:23 -0800 |
| commit | aa3f98037ce3bcf850bb41f7530754d27481a792 (patch) | |
| tree | aa539f1e52ea35f7c9f7a3e6e2171d72863e51d4 /drivers/pcmcia/sa11xx_base.c | |
| parent | f6c427663a158056cd8ca71c01f30653e4b313f7 (diff) | |
| parent | e5fa443ea05f71b5253818890c6d32174cbab36f (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] qdio: FCP/SCSI write I/O stagnates on LPAR
[S390] Fix futex_atomic_cmpxchg_std inline assembly.
[S390] dcss: Fix Unlikely(x) != y
[S390] sclp: clean up send/receive naming scheme
[S390] etr: fix compile error on !SMP
[S390] qdio: fix qdio_activate timeout handling.
[S390] Initialize per cpu lowcores on cpu hotplug.
[S390] find bit corner case.
[S390] dasd: fix locking in __dasd_device_process_final_queue
[S390] Make sure enabled wait psw is loaded in default_idle.
[S390] Let NR_CPUS default to 32/64 on s390/s390x.
[S390] cio: Do timed recovery on workqueue.
[S390] cio: Remember to initialize recovery_lock.
Diffstat (limited to 'drivers/pcmcia/sa11xx_base.c')
0 files changed, 0 insertions, 0 deletions