tree a869974378be9c20f311ad3d934eb3946e813a1a
parent 5de4c51d2a859a1556b7d20ae1278c3e2d70a79b
parent 2f2a2132ff056bb45697dc855eb4fd95b70b38cb
author Linus Torvalds <torvalds@linux-foundation.org> 1239382909 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239382909 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
  Separate out the proc- and unit-specific header directories from the general
  Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.