aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 18:21:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-22 18:21:38 -0700
commita2b297ff56b9bad251d11a476880a5e4614cd92f (patch)
tree511c49ec8a9a1593b0ae943b63e1953a6a565946 /net/tipc
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 (diff)
parentmd/raid5: fix previous patch. (diff)
downloadlinux-dev-a2b297ff56b9bad251d11a476880a5e4614cd92f.tar.xz
linux-dev-a2b297ff56b9bad251d11a476880a5e4614cd92f.zip
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: md/raid5: fix previous patch.
Diffstat (limited to 'net/tipc')
0 files changed, 0 insertions, 0 deletions