summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-24 17:32:23 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-24 17:32:23 +0200
commit198aa045601d20f39658c892dc626e16993bae78 (patch)
treeef000627fabe4fa3ff1818dc2e591b6417ca1eb6 /fs
parentMerge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (diff)
parentm68k: Update defconfigs for 2.6.30-rc3 (diff)
downloadlinux-198aa045601d20f39658c892dc626e16993bae78.tar.xz
linux-198aa045601d20f39658c892dc626e16993bae78.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: m68k: Update defconfigs for 2.6.30-rc3 m68k,m68knommu: Wire up preadv and pwritev scsi: a4000 - Correct driver unregistration in case of failure
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions