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)
* 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/.


Trivial merge