diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-10 02:01:26 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-10 02:01:26 +0100 |
commit | ac73fddfc523bf3c3525d16356b44527c44fae6d (patch) | |
tree | 77c22e04557e35168b1df43e1018a4f8241df224 /net/irda/irnet/irnet_ppp.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri... (diff) | |
parent | md: fix some lockdep issues between md and sysfs. (diff) | |
download | linux-ac73fddfc523bf3c3525d16356b44527c44fae6d.tar.xz linux-ac73fddfc523bf3c3525d16356b44527c44fae6d.zip |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: fix some lockdep issues between md and sysfs.
md: fix 'degraded' calculation when starting a reshape.
Diffstat (limited to 'net/irda/irnet/irnet_ppp.c')
0 files changed, 0 insertions, 0 deletions