| commit | 8a0382f6fceaf0c6479e582e1054f36333ea3d24 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 03 21:57:06 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 03 21:57:06 2009 -0700 |
| tree | 2ec107d486a57584f2b4ae431e70abbc11661d68 | |
| parent | 0b5759c654e74c8dc317ea2c6b3a7476160f688a [diff] | |
| parent | 0a3d31b79e7fa600108e699805e2b2f9ea1f3194 [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: Fix IPI function calls for SMP m32r: Fix set_memory() for DISCONTIGMEM m32r: add rtc_lock variable m32r: define ioread* and iowrite* macros m32r: export delay loop symbols m32r: fix tme_handler