commit | a92b166e6b8c3c0037493690b2800b0b0dd92063 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 10 14:13:35 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 10 14:13:35 2010 -0700 |
tree | 0d9d52d09d5145f2a058b546077c641413786b48 | |
parent | 0d6ffdb8f151a2b685c7b45bde7ab2d49fc1bb00 [diff] | |
parent | 2190a1e7705456c2298873b2547a6eb19b8e31ae [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: zorro: Fix reading of proc/bus/zorro/* in small chunks zorro: BKL removal m68k/mac: Fix RTC on PMU machines m68k/mac: Add color classic ii support arch/m68k/sun3/leds.c: Checkpatch cleanup