summaryrefslogtreecommitdiff
path: root/sound/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-12 08:30:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-12 08:30:57 -0700
commitb2d6744849b5bf6b4593b81c136772df7a238ac9 (patch)
treef27260a0b16412449c4205207af114646c29e2c4 /sound/pcmcia
parentc67646641cab01c93a56674bfcd963f55442dad5 (diff)
parentd2c993d845781d160a7ef759a3e65c6892c4a270 (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] Fix sparse warnings. [S390] path grouping and path verifications fixes. [S390] xpram module parameter parsing. [S390] cpu_relax() is supposed to have barrier() semantics. [S390] fix futex_atomic_cmpxchg_inatomic [S390] subchannel register/unregister mutex. [S390] raw_local_save_flags/raw_local_irq_restore type check [S390] __builtin_trap() and gcc version.
Diffstat (limited to 'sound/pcmcia')
0 files changed, 0 insertions, 0 deletions