diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 17:47:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 17:47:58 -0700 |
| commit | ffbf0ab1a648b867ce953cc43557090f679bb9c1 (patch) | |
| tree | df90a9fe3b46b636d977e9aa993efe5588436d1c /arch/x86/kernel | |
| parent | 73939bb56acef1c9e776a10f0aeea0456d6815f6 (diff) | |
| parent | 66d857b08b8c3ed5c72c361f863cce77d2a978d7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: merge m68k and m68knommu arch directories
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions