Merge tag 'stable/for-linus-3.18-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...
[pandora-kernel.git] / arch / x86 / include / asm / pgtable_types.h
Simple merge