From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Apr 2009 16:57:17 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
X-Git-Tag: firefly_0821_release~14428
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4dc8ab86e0724642e2f778116de64f4b832d7d94;p=firefly-linux-kernel-4.4.55.git

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

4dc8ab86e0724642e2f778116de64f4b832d7d94