tree 2c35b2ce8ea83f936ac6ff811e50e726ce1f9308
parent 65fd21058a791f35aff11eeccd2e270f0faf11ec
parent 9cd67243de582c206758adff152c5fcc1b2aa069
author Linus Torvalds <torvalds@linux-foundation.org> 1241306938 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1241306938 -0700

Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r: use __stringify() macro in assembler.h
  m32r: build fix for __stringify macro