Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2009 16:57:17 +0000 (09:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Apr 2009 16:57:17 +0000 (09:57 -0700)
* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r: move include/asm-m32r/* to arch/m32r/include/asm/
  m32r: move include/asm-m32r headers to arch/m32r/include/asm


Trivial merge