From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2009 16:02:31 +0000 (-0700)
Subject: Merge branches 'frv' and 'mn10300'
X-Git-Tag: v2.6.31-rc1~398
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59c288ffb6dfb55bdd6bfe6826ab6203ff791930;p=thirdparty%2Fkernel%2Flinux.git

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
---

59c288ffb6dfb55bdd6bfe6826ab6203ff791930