| commit | 3a2289a4a317e0290a8bc7af28c62c9830cb12e5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 14 11:28:54 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 14 11:28:54 2011 -0700 |
| tree | f1230c3fd1025c118ba6b7263c4987b962a7288c | |
| parent | ca5432010e45d7f809b441b0c1e85e84b039cd85 [diff] | |
| parent | 734c3ce3bd4d51c932893b9f6d32b9ded31acdff [diff] |
Merge branch 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: use kernel processor defines for conditional optimizations m68knommu: create config options for CPU classes m68knommu: fix linker script exported name sections