| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 18 Jan 2013 19:58:10 +0000 (11:58 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 18 Jan 2013 19:58:10 +0000 (11:58 -0800) |
Pull m68knommu arch fixes from Greg Ungerer:
"This contains a couple of fixes, both affecting compilation of non-mmu
m68k targets."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: fix conditional use of init_pointer_table
m68knommu: add KMAP definitions for non-MMU definitions
"This contains a couple of fixes, both affecting compilation of non-mmu
m68k targets."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: fix conditional use of init_pointer_table
m68knommu: add KMAP definitions for non-MMU definitions
Trivial merge