Merge branch 'master' of git://gitorious.org/linux-on-wince-htc/linux_on_wince_htc

Browse Source

Conflicts:
	drivers/video/msm/mdp_lcdc.c

...

This commit is contained in:

Jon Benson

2010-10-18 13:42:40 +11:00

parent c08b0fe05a 49a440240c

commit 5c24f34247

1 changed files with 1196 additions and 853 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

drivers/media/video/msm/s5k3e2fx.c

+1196 -853

File diff suppressed because it is too large Load Diff