| commit | e177bb587ea0fade3d9a86f6667da8d89bea3607 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 20 14:27:00 2013 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 20 14:27:00 2013 -0800 |
| tree | daebf1786d014cc3182137c76e02381d0aceb245 | |
| parent | 55529fa5762462beb39f913c5277cb96c7be0858 [diff] | |
| parent | 561839598e61f03c9175183ea066b2b7fa58ce85 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k Pull m68k update from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA swim: Add missing spinlock init