diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-25 12:21:48 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-25 12:21:48 -0700 |
| commit | 2da8a79f7d81853d00b6a00621aeef7545196084 (patch) | |
| tree | 5a3962136d574d05a788f0fbac0f36c528efc699 /scripts/patch-kernel | |
| parent | Merge branch 'omap-for-v3.8/cleanup-headers-usb' into omap-for-v3.8/cleanup-h... (diff) | |
| parent | ARM: OMAP2: Move plat/menelaus.h to linux/mfd/menelaus.h (diff) | |
| download | linux-2da8a79f7d81853d00b6a00621aeef7545196084.tar.gz linux-2da8a79f7d81853d00b6a00621aeef7545196084.zip | |
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup-headers
Conflicts:
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-n8x0.c
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions