drivers/misc/apds990x.c: apds990x_chip_on() should depend on CONFIG_PM || CONFIG_PM_R...
[pandora-kernel.git] / mm / memcontrol.c
diff --cc mm/memcontrol.c
Simple merge