summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/o2micro.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-22 23:36:17 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-22 23:36:17 (GMT)
commitad1fca2003822ff2f24c88ad68a29970c5e0d0a7 (patch)
tree710fdaa4423365414bd2ab43b135557b7469fc39 /drivers/pcmcia/o2micro.h
parentb3b1b70e62a603f473619dbebc3b3d23f535e6f8 (diff)
parent961902c0f8240175729274cd14198872f42072b7 (diff)
downloadlinux-fsl-qoriq-ad1fca2003822ff2f24c88ad68a29970c5e0d0a7.tar.xz
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md: md/bitmap: It is OK to clear bits during recovery. md: don't give up looking for spares on first failure-to-add md/raid5: ensure correct assessment of drives during degraded reshape. md/linear: fix hot-add of devices to linear arrays.
Diffstat (limited to 'drivers/pcmcia/o2micro.h')
0 files changed, 0 insertions, 0 deletions