Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Apr 2009 17:01:49 +0000 (10:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Apr 2009 17:01:49 +0000 (10:01 -0700)
commitd848223808c5d21e1b3cea090047e34722c6254b
treea869974378be9c20f311ad3d934eb3946e813a1a
parent5de4c51d2a859a1556b7d20ae1278c3e2d70a79b
parent2f2a2132ff056bb45697dc855eb4fd95b70b38cb
Merge git://git./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/.