tree d4a0eb46348289590f90fadf52644aa21e0ffb29
parent 40689ac479e6477096b3dbd5a374cfe3970da3a3
parent f82735d55056b200eab19749398457a2f534306b
author Linus Torvalds <torvalds@linux-foundation.org> 1349124951 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1349124951 -0700

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

Pull m68k updates from Geert Uytterhoeven:
 "All pretty boring, seems like all of us had better things to do last
  summer..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
  m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
  m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
  m68k/apollo: Remove disabled definitions in apollohw.h