summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/free-space-cache.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-05 11:53:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-05 11:53:47 -0700
commit62ad64498a2e72eb9fb70ab80e20ecc9cac8d40b (patch)
tree65ca54c82225de951fc1b1ecddda777b62616e6e /fs/btrfs/free-space-cache.c
parent9e85a6f9dc231f3ed3c1dc1b12217505d970142a (diff)
parent107a84e61cdd3406c842a0e4be7efffd3a05dba6 (diff)
downloadop-kernel-dev-62ad64498a2e72eb9fb70ab80e20ecc9cac8d40b.zip
op-kernel-dev-62ad64498a2e72eb9fb70ab80e20ecc9cac8d40b.tar.gz
Merge branch 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux
Pull DT fixes from Rob Herring: "Mainly some documentation updates and 2 fixes: - An export symbol fix for of_platform_populate from Stephen W. - A fix for the order compatible entries are matched to ensure the first compatible string is matched when there are multiple matches." Normally these would go through Grant Likely (thus the "fixes-for-grant" branch name), but Grant is in the middle of moving to Scotland, and is practically offline until sometime in August. So pull directly from Rob. * 'fixes-for-grant' of git://sources.calxeda.com/kernel/linux: of: match by compatible property first dt: mc13xxx.txt: Fix gpio number assignment dt: fsl-fec.txt: Fix gpio number assignment dt: fsl-mma8450.txt: Add missing 'reg' description dt: fsl-imx-esdhc.txt: Fix gpio number assignment dt: fsl-imx-cspi.txt: Fix comment about GPIOs used for chip selects of: Add Avionic Design vendor prefix of: export of_platform_populate()
Diffstat (limited to 'fs/btrfs/free-space-cache.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud