summaryrefslogtreecommitdiffstats
path: root/fs/jbd2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-25 08:17:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-25 08:17:11 +0200
commitf97f7d2d27bf092b40babda9ded29cc85cf77eec (patch)
treebd6b038bb85e6265c8aed04211687ac6f5b859e5 /fs/jbd2
parentfs: fix new splice.c kernel-doc warning (diff)
parentMerge remote-tracking branch 'spi/fix/s3c64xx' into spi-linus (diff)
downloadlinux-f97f7d2d27bf092b40babda9ded29cc85cf77eec.tar.xz
linux-f97f7d2d27bf092b40babda9ded29cc85cf77eec.zip
Merge tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi updates from Mark Brown: "A few last minute SPI updates: fix a missized allocation and use atomic allocations in atomic context in the PXA driver, and fix the checking of return codes in the S3C64xx driver which caused spurious errors under heavy load." * tag 'spi-v3.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi/pxa2xx: fix memory corruption due to wrong size used in devm_kzalloc() spi/pxa2xx: use GFP_ATOMIC in sg table allocation spi: s3c64xx: Fix pm_runtime_get_sync() return value check
Diffstat (limited to 'fs/jbd2')
0 files changed, 0 insertions, 0 deletions