| commit | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 26 10:33:01 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 26 10:33:01 2009 -0800 |
| tree | d498e947176f4b77938034ff6c6427f9875da721 | |
| parent | 9f4863b7dc7f545bb3a01746feafdc1208e86c89 [diff] | |
| parent | 49148020bcb6910ce71417bd990a5ce7017f9bd3 [diff] |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k,m68knommu: merge header files Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild