Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
[pandora-kernel.git] / mm / rmap.c
diff --cc mm/rmap.c
Simple merge