diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-21 19:40:31 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-06-21 19:40:31 +1000 |
| commit | 6d0143d75b86255a2d77f159bc49b8801d07947a (patch) | |
| tree | 38e3efeb6b082cbe9dd690accfd49ab670ab799a /drivers/media/platform/omap/Kconfig | |
| parent | 4fb148e1645e7f9fb9efd6868013d455cb6f92c6 (diff) | |
| parent | d74235fc3a7fafbf76ee9598404ea0ea6dbb4431 (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/machine_kexec_64.c
drivers/staging/android/lowmemorykiller.c
Diffstat (limited to 'drivers/media/platform/omap/Kconfig')
0 files changed, 0 insertions, 0 deletions