Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:28:58 +0000 (16:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:28:58 +0000 (16:28 -0700)
commit912e7796b06fa9b1006835605e27c42e46801b8f
tree2c35b2ce8ea83f936ac6ff811e50e726ce1f9308
parent65fd21058a791f35aff11eeccd2e270f0faf11ec
parent9cd67243de582c206758adff152c5fcc1b2aa069
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: use __stringify() macro in assembler.h
  m32r: build fix for __stringify macro