tree ea90ecfb238c7526c2e012dabe48a455f5eea5d7
parent 6a3956bd242926f8956992f6ed7805b0811be003
parent 5e4bf1a55da976a5ed60901bb8801f1024ef9774
author H. Peter Anvin <hpa@linux.intel.com> 1359158615 -0800
committer H. Peter Anvin <hpa@linux.intel.com> 1359158740 -0800

Merge branch 'x86/mm' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/tip/tip into x86/mm

Add missing patch from the __pa_symbol conversion series by Alexander
Duyck.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>