| commit | 4dc8ab86e0724642e2f778116de64f4b832d7d94 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 17 09:57:17 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 17 09:57:17 2009 -0700 |
| tree | ba3e1327823ac94dc5d33cb76d8704ea0ad915d7 | |
| parent | b9836e08375d86834edcde45e3628e63db8b9624 [diff] | |
| parent | 78a49990269a539fc77e9a669d9e74e1dfaec657 [diff] |
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: move include/asm-m32r/* to arch/m32r/include/asm/ m32r: move include/asm-m32r headers to arch/m32r/include/asm