Merge branch 'master' into for-next

[pandora-kernel.git] / fs / xfs / kmem.h

diff --git a/fs/xfs/linux-2.6/kmem.h b/fs/xfs/kmem.h
similarity index 100%
rename from fs/xfs/linux-2.6/kmem.h
rename to fs/xfs/kmem.h