diff options
author | Tony Lindgren <tony@atomide.com> | 2011-03-03 02:07:14 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-03-03 02:07:14 +0100 |
commit | 12d7d4e0ed8fecf7f74c89483b55b300be6e5901 (patch) | |
tree | f573761ac752ff04ec445e23aef50adadda49790 /mm/percpu-vm.c | |
parent | omap: omap3evm: add support for the WL12xx WLAN module to the omap3evm (diff) | |
parent | arm: omap: fix section mismatch warning (diff) | |
download | linux-12d7d4e0ed8fecf7f74c89483b55b300be6e5901.tar.xz linux-12d7d4e0ed8fecf7f74c89483b55b300be6e5901.zip |
Merge branch 'devel-cleanup' into omap-for-linus
Conflicts:
arch/arm/mach-omap2/timer-gp.c
Diffstat (limited to 'mm/percpu-vm.c')
0 files changed, 0 insertions, 0 deletions