diff options
| author | Colin Cross <ccross@android.com> | 2010-12-21 18:38:13 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-12-21 18:38:13 -0800 |
| commit | 3f29a8834975956ed5590959bfced00cb9bd03ed (patch) | |
| tree | 03489c32e70a21b586678d217467dce2f1b44cdc /drivers/video/fbcvt.c | |
| parent | 4ad2ce14311f7ee8474ee48b8fb0fad72648e5eb (diff) | |
| parent | b104a07edb2a319f734ddc4fe04852865d8d9e24 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
drivers/usb/gadget/composite.c
Change-Id: I1a332ec21da62aea98912df9a01cf0282ed50ee1
Diffstat (limited to 'drivers/video/fbcvt.c')
0 files changed, 0 insertions, 0 deletions