diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-09 17:06:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-09 17:06:44 +1100 |
| commit | 8c1f750c9b18c3ce3c762f73cf50752222a961c4 (patch) | |
| tree | 5043c81c9a5ba81e6ec20b027d2843c79ca8b2bc /mm/mempolicy.c | |
| parent | e10713dedb695b2452a422e4b072ef20546fb429 (diff) | |
| parent | 28d6b6dd34438a8570f6165d6b07b90ad79ed8d2 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/Kconfig
arch/x86/mm/numa.c
block/blk-mq-cpu.c
mm/memcontrol.c
mm/mlock.c
Diffstat (limited to 'mm/mempolicy.c')
0 files changed, 0 insertions, 0 deletions