diff options
| author |   Simon Horman <horms+renesas@verge.net.au> | 2013-10-08 10:01:47 +0900 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-10-08 10:01:47 +0900 |
| commit | 661a7335c4e47726df1e7264580209847509569a (patch) | |
| tree | 9f86456e42fd13c3b82f630e6319faa3e6146732 /include/linux/flex_array.h | |
| parent | Merge branch 'heads/soc2' into boards2-base (diff) | |
| parent | ARM: shmobile: r8a7791 SMP support (diff) | |
Merge branch 'heads/soc2' into boards2-base
Conflicts:
arch/arm/mach-shmobile/board-lager.c
Diffstat (limited to 'include/linux/flex_array.h')
0 files changed, 0 insertions, 0 deletions