summaryrefslogtreecommitdiffstats
path: root/fs/ufs/ufs.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-07 20:54:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-07 20:54:50 -0400
commitc91662cb18f00f225c74816353f222b6997131ca (patch)
treeaf4a2bb55cd4f093664836418c4428d5d68d6f5b /fs/ufs/ufs.h
parentd0cd84817c745655428dbfdb1e3f754230b46bef (diff)
parenta18c3f16a907b8977ef65fc8dd71ed3f7b751748 (diff)
downloadblackbird-op-linux-c91662cb18f00f225c74816353f222b6997131ca.tar.gz
blackbird-op-linux-c91662cb18f00f225c74816353f222b6997131ca.zip
Merge tag 'edac_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC fixes from Borislav Petkov: "Misc small fixes/improvements accumulated from the summer months, nothing earth-shattering. The mpc85xx_edac fix is tagged for stable but since it got confirmed only days before the final 3.17 release, I didn't rush a last minute pull request to you. I hope that's ok as it will trickle down to stable anyway and we'll make sure it lands in 3.17-stable too" * tag 'edac_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: mpc85xx_edac: Make L2 interrupt shared too amd64_edac: Modify usage of amd64_read_dct_pci_cfg() ppc4xx_edac: Fix build error caused by wrong member access EDAC: Fix mem_types strings type
Diffstat (limited to 'fs/ufs/ufs.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud