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


Trivial merge