diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-22 11:38:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-22 11:38:57 -0700 |
| commit | 39678e5e38055753ae08007ec8bcae31b122a0d0 (patch) | |
| tree | 56d78e9e72e09e5a183bbc2f0c727010533c4971 /arch/sh | |
| parent | f762dd68218665bb87d4e4a0eeac86fde7530293 (diff) | |
| parent | 7a2cf4af1554d891b440cc3a649d01ed222206c3 (diff) | |
Merge branch 'fix-includes' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/sh')
0 files changed, 0 insertions, 0 deletions