tree 33e4072d5539741e775788eb7dd0ffcf84208d3b
parent d9f5d41569731189e519fcee8578fcef5c916978
parent 5e1c53356d79591b10cdea12e3d5ebace8e7b6fa
author Linus Torvalds <torvalds@linux-foundation.org> 1282148830 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282148830 -0700

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: include sched.h in ColdFire/SPI driver
  m68knommu: formatting of pointers in printk()
  m68knommu: arch/m68k/include/asm/ide.h fix for nommu