diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-29 00:41:03 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-29 00:41:03 +0200 |
| commit | c81592ba1b012d555d0cb7ec711afda89c327469 (patch) | |
| tree | 44e36c4785fc6169b971922097d7b3941101b3e1 /block/bsg.c | |
| parent | OMAP1: PM: update and decouple from OMAP2/3 PM core (diff) | |
| parent | ARM: OMAP1: Make 770 LCD work (diff) | |
| download | linux-c81592ba1b012d555d0cb7ec711afda89c327469.tar.xz linux-c81592ba1b012d555d0cb7ec711afda89c327469.zip | |
Merge branch 'omap-upstream' into for-next
Conflicts:
arch/arm/mach-omap2/Makefile
Diffstat (limited to 'block/bsg.c')
0 files changed, 0 insertions, 0 deletions