aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/hp-wmi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 12:39:19 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 12:39:19 -0800
commitb73d45dac75fe956ecf6a81c524127f2e44507ef (patch)
treebfc974a8a6cab301fd4b99cd61923c2ec3fa775f /drivers/platform/x86/hp-wmi.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentmd: allow a resync that is waiting for other resync to complete, to be aborted. (diff)
downloadlinux-dev-b73d45dac75fe956ecf6a81c524127f2e44507ef.tar.xz
linux-dev-b73d45dac75fe956ecf6a81c524127f2e44507ef.zip
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: md: allow a resync that is waiting for other resync to complete, to be aborted. md: remove unnecessary code from do_md_run md: make recovery started by do_md_run() visible via sync_action md: fix small irregularity with start_ro module parameter md: Fix unfortunate interaction with evms
Diffstat (limited to 'drivers/platform/x86/hp-wmi.c')
0 files changed, 0 insertions, 0 deletions