tree b5d8fe764f521837202cab2d16b63936ea487264
parent b84297197ce60bb5da14cbd5516cf5130b0cd380
parent 70c778f7a1075cf688ef50ca52c464e7ea60b506
author Linus Torvalds <torvalds@linux-foundation.org> 1339475998 +0300
committer Linus Torvalds <torvalds@linux-foundation.org> 1339475998 +0300

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu from Greg Ungerer:
 "This contains five fixes.  Four fix build problems introduced by
  recent clean up and merging of the m68k timer and ptrace code.  The
  other fixes the 528x ColdFire CPU QSPI base address definition, missed
  in the ColdFire QSPI cleanup."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: make syscall_trace_enter/leave exist for non-MMU classic m68k types
  m68knommu: fix 68360 local setting of timer interrupt handler
  m68knommu: fix 68328 local setting of timer interrupt handler
  m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types
  m68knommu: m528x qspi definition fix