| commit | b814469ad515c70d9269d5268607bd6fbfb32533 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 18 11:58:10 2013 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 18 11:58:10 2013 -0800 |
| tree | 680707495159d77825aba7155667b33de97f63cb | |
| parent | 2f91ec8cc456d6e57db3ebced34a9e96a356168f [diff] | |
| parent | d6fccc756328441511c2b752d394a2b3dae4ec31 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 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