diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-28 12:42:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-01-28 13:02:27 +1100 |
| commit | 61fea716ed0087e95fe7e96eef82fe35029103fc (patch) | |
| tree | 7812f93480463cad1bcdd9b7bfcafd094bed229a /drivers/bus/omap_l3_smx.c | |
| parent | e9354255e8fea409b3de544fc1c46b7f2b1f202e (diff) | |
| parent | 0fc6f4e2e3d58ccf7439a0bdda8f6fb9cecc2d5d (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
Documentation/devicetree/bindings/vendor-prefixes.txt
Documentation/kernel-parameters.txt
Documentation/sysctl/kernel.txt
arch/x86/mm/srat.c
include/linux/vm_event_item.h
lib/percpu_counter.c
lib/vsprintf.c
mm/memcontrol.c
mm/nobootmem.c
mm/oom_kill.c
mm/page_alloc.c
mm/rmap.c
Diffstat (limited to 'drivers/bus/omap_l3_smx.c')
0 files changed, 0 insertions, 0 deletions