tree e556734f9aa29007f86deb35e0e9fa182923dd23
parent d5d6eba94b4c390c29e375bacabf9fdc2f01243d
parent a556bec9955c8e47b40a87dbfeef6f24d3b2228f
author Linus Torvalds <torvalds@linux-foundation.org> 1257788841 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257788841 -0800

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: fix arch/m32r/boot/compressed/Makefile