From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Mar 2009 18:38:57 +0000 (-0700)
Subject: Merge branch 'fix-includes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg... 
X-Git-Tag: v3.12-rc1~15666
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39678e5e38055753ae08007ec8bcae31b122a0d0;p=kernel%2Fkernel-generic.git

Merge branch 'fix-includes' of git://git./linux/kernel/git/gerg/m68knommu

* 'fix-includes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: merge the non-MMU and MMU versions of siginfo.h
  m68k: use the MMU version of unistd.h for all m68k platforms
  m68k: merge the non-MMU and MMU versions of signal.h
  m68k: merge the non-MMU and MMU versions of ptrace.h
  m68k: use MMU version of setup.h for both MMU and non-MMU
  m68k: merge the non-MMU and MMU versions of sigcontext.h
  m68k: merge the non-MMU and MMU versions of swab.h
  m68k: merge the non-MMU and MMU versions of param.h
---

39678e5e38055753ae08007ec8bcae31b122a0d0