summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2010-05-04 08:48:53 +0200
committerJens Axboe <jens.axboe@oracle.com>2010-05-04 08:48:53 +0200
commit6a7cc883d6ad95bb89282fc04e917c16d2b5584f (patch)
treed22aadedb814584b7305586feefbcb35345372de /init
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff)
parentdrbd: don't expose failed local READ to upper layers (diff)
downloadlinux-6a7cc883d6ad95bb89282fc04e917c16d2b5584f.tar.xz
linux-6a7cc883d6ad95bb89282fc04e917c16d2b5584f.zip
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-linus
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions