aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-10 14:13:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-10 14:13:35 -0700
commita92b166e6b8c3c0037493690b2800b0b0dd92063 (patch)
tree0d9d52d09d5145f2a058b546077c641413786b48 /fs
parentMerge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff)
parentzorro: Fix reading of proc/bus/zorro/* in small chunks (diff)
downloadlinux-dev-a92b166e6b8c3c0037493690b2800b0b0dd92063.tar.xz
linux-dev-a92b166e6b8c3c0037493690b2800b0b0dd92063.zip
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions