| commit | 5ec390e046039942d59ef2634b967b8b23fc57c2 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 12 18:47:55 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 12 18:47:55 2010 -0700 |
| tree | c1d80246ec80ef60335f7bbcc6f5c22db901edcb | |
| parent | cdf5f61ed1d64d50eb9cf10071ab40836f5f9f91 [diff] | |
| parent | 57d84906f0f3005d4d22e13a3f5102a16a7fc4a2 [diff] |
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] correct address of _stext with CONFIG_SHARED_KERNEL=y [S390] ptrace: fix return value of do_syscall_trace_enter() [S390] dasd: fix race between tasklet and dasd_sleep_on