diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 17:17:29 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 17:17:29 +1100 |
| commit | db46e39d17dd4fc749fe211b001ee20463b1f57a (patch) | |
| tree | ec2b70ac4d863770109586874766fbd2675d53e8 /tools | |
| parent | 60501a1d014242787216ab07669f22392710f5ec (diff) | |
| parent | aacb4387a1e6f3b57977375532c6d8e47fcd5652 (diff) | |
Merge remote branch 'omap_dss2/for-next'
Conflicts:
arch/arm/mach-omap2/board-omap3pandora.c
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions