diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 09:02:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-11 09:02:31 -0700 |
| commit | 59c288ffb6dfb55bdd6bfe6826ab6203ff791930 (patch) | |
| tree | 4d71d9497c1f91771c508334e8cce6d4b52ec7d0 | |
| parent | 49c355617f603b8e71ec117c1f940152a998528a (diff) | |
| parent | 4a3b98932270f5d69f2c081924e356325ed704d9 (diff) | |
| parent | 5d289964e1f1e8a2ec4289274bf15bce6a4f8ab8 (diff) | |
| download | linux-3.10-59c288ffb6dfb55bdd6bfe6826ab6203ff791930.tar.gz linux-3.10-59c288ffb6dfb55bdd6bfe6826ab6203ff791930.tar.bz2 linux-3.10-59c288ffb6dfb55bdd6bfe6826ab6203ff791930.zip | |
Merge branches 'frv' and 'mn10300'
* frv:
FRV: Implement new-style ptrace
FRV: Don't turn on TIF_SYSCALL_TRACE unconditionally in syscall prologue
FRV: Implement TIF_NOTIFY_RESUME
FRV: Remove in-kernel strace code
FRV: BUG to BUG_ON changes
FRV: bitops: Change the bitmap index from int to unsigned long
* mn10300:
MN10300: Add utrace/tracehooks support
MN10300: Don't set the dirty bit in the DTLB entries in the TLB-miss handler