summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/nsinit.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 22:56:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 22:56:32 -0700
commit93416253073511716f7e70c06e32c3810c3deac4 (patch)
tree7e6a4c7dab40596f6b622f0eaa4b3366ed671b79 /drivers/acpi/acpica/nsinit.c
parentb4322e7057ca851b0a3e15f29e26806efeada100 (diff)
parent3424bf6a772cff606fc4bc24a3639c937afb547f (diff)
downloadlinux-93416253073511716f7e70c06e32c3810c3deac4.tar.bz2
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: md/raid5: don't include 'spare' drives when reshaping to fewer devices. md/raid5: add a missing 'continue' in a loop. md/raid5: Allow recovered part of partially recovered devices to be in-sync md/raid5: More careful check for "has array failed". md: Don't update ->recovery_offset when reshaping an array to fewer devices. md/raid5: avoid oops when number of devices is reduced then increased. md: enable raid4->raid0 takeover md: clear layout after ->raid0 takeover md: fix raid10 takeover: use new_layout for setup_conf md: fix handling of array level takeover that re-arranges devices. md: raid10: Fix null pointer dereference in fix_read_error() Restore partition detection of newly created md arrays.
Diffstat (limited to 'drivers/acpi/acpica/nsinit.c')
0 files changed, 0 insertions, 0 deletions