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)
commit4dc8ab86e0724642e2f778116de64f4b832d7d94
treeba3e1327823ac94dc5d33cb76d8704ea0ad915d7
parentb9836e08375d86834edcde45e3628e63db8b9624
parent78a49990269a539fc77e9a669d9e74e1dfaec657
Merge branch 'for-linus' of git://linux-m32r.org/git/takata/linux-2.6_dev

* '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