]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
authorChris Mason <chris.mason@oracle.com>
Thu, 29 Jan 2009 01:29:43 +0000 (20:29 -0500)
committerChris Mason <chris.mason@oracle.com>
Thu, 29 Jan 2009 01:29:43 +0000 (20:29 -0500)
commitcd2f88facb4c56d5cfbbc020b57ae21404e28eb4
tree315920ade3b68bf20c4080bcd1bf2bc34a5d5ab7
parent1c3a07090fef1b9cbbcfb1631cd785b6c205ce3b
parent44fd6648aab6293c05f7675f1f911d84a39aa5d6
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

Fix fs/btrfs/super.c conflict around #includes
MAINTAINERS
fs/btrfs/super.c