tree 09c871320e6918ebb9b642a632971b364684d8a3
parent 0191b625ca5a46206d2fb862bb08f36f2fcb3b31
parent aa6eeeef78263e9891185c6cfaaf64808460a54a
author Linus Torvalds <torvalds@linux-foundation.org> 1230497647 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1230497647 -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: use the new byteorder headers
  fbcon: Protect free_irq() by MACH_IS_ATARI check
  fbcon: remove broken mac vbl handler
  m68k: fix trigraph ignored warning in setox.S
  macfb annotations and compiler warning fix
  m68k: mac baboon interrupt enable/disable
  m68k: machw.h cleanup
  m68k: Mac via cleanup and commentry
  m68k: Reinstate mac rtc