summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-23 21:49:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-23 21:49:56 -0700
commit270868f6e654b2c37627bba52c62f352735f99ba (patch)
tree2644aa062465466e1f7895bee147fc14531c2558 /fs
parent7ca63ee1b005623af7c4f3481a2976de3b9fed53 (diff)
parent9974e43d900af7979e0a571b8e0c9674c7399b79 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE power management bugfix from David S. Miller. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide: ide: fix generic_ide_suspend/resume Oops
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions