summary refs log tree commit diff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-01-26 23:13:20 -0800
committerOlof Johansson <olof@lixom.net>2012-01-26 23:13:20 -0800
commitd8c4cd7463ab4b09aa0b1bd79f36c3ebacd2cc77 (patch)
treec383591478a2f364deb0523fc2f86aafdd21eac5 /fs/btrfs
parent3c8cee3b408ba3d2e2527eef734b5503ac5c9188 (diff)
parent2ab1159e80e8f416071e9f51e4f77b9173948296 (diff)
downloadlinux-d8c4cd7463ab4b09aa0b1bd79f36c3ebacd2cc77.tar.gz
Merge branch 'fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
* 'fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball
  mach-ux500: enable ARM errata 764369
  mach-ux500: do not override outer.inv_all
  mach-ux500: musb: now musb is always in OTG mode
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions