tree dfe0527c7f3877eb4d155ddb20fd303c1d8328c0
parent bb592cf474404e51cbf3c419fb72fda83c4b7d72
parent 49966bae8446f5ba7e8afbd01bde82af4e00628a
author Linus Torvalds <torvalds@linux-foundation.org> 1260288815 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260288815 -0800

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: parport_mfc3 - Not makes it a bool before the comparison.
  m68k: don't export static inline functions
  fbdev: atafb - add palette register check
  m68k: Remove the BKL from sys_execve
  m68k: Cleanup linker scripts using new linker script macros.
  m68k: Make thread_info.h usable from assembly.
  m68knommu: define arch_has_single_step() and friends
  m68k: ptrace fixes
  m68k: use generic code for ptrace requests
  rtc: Add an RTC driver for the Ricoh RP5C01
  rtc: Add an RTC driver for the Oki MSM6242