summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-11 16:25:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-11 16:25:41 -0800
commit463eb8ac337bad30ace10835108a56df5817cc76 (patch)
tree9b12418e1e37a2317eb0d700a703bbca9f462689 /fs/btrfs
parent88cbfd07119e394b9cbb1a4a764056c4b37e8378 (diff)
parent74b18e1750201530ce285a5cd1269a9fb592d905 (diff)
downloadlinux-463eb8ac337bad30ace10835108a56df5817cc76.tar.gz
linux-463eb8ac337bad30ace10835108a56df5817cc76.tar.bz2
linux-463eb8ac337bad30ace10835108a56df5817cc76.zip
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull small x86 boot update from Ingo Molnar: "A single update to the MAINTAINERS file" * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/tboot: Update maintainer list for Intel TXT
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions