diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-07 08:41:56 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-07 08:44:52 +0200 |
| commit | 69e815b819c5523b6bb3a0157cdcb4cb67839876 (patch) | |
| tree | a8cb378762f1db58c4c3d22964103b0ea2765eea /arch/arm/mach-omap2/board-ldp.c | |
| parent | c8adc84533d7e98487b77154eedf2eaf0ed6037e (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into imx-for-next
Resolved conflict in arch/arm/mach-mx3/mach-mx31lilly.c
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
0 files changed, 0 insertions, 0 deletions