From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Aug 2010 16:27:10 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
X-Git-Tag: v3.0~3565
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'for-linus' of git://git./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
---

6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8