]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 16:27:10 +0000 (09:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 16:27:10 +0000 (09:27 -0700)
commit6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8
tree33e4072d5539741e775788eb7dd0ffcf84208d3b
parentd9f5d41569731189e519fcee8578fcef5c916978
parent5e1c53356d79591b10cdea12e3d5ebace8e7b6fa
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
arch/m68knommu/kernel/process.c