Skip to content
Snippets Groups Projects
Commit 4f1f1d48 authored by Dima Zavin's avatar Dima Zavin
Browse files

Merge remote branch 'stable/linux-2.6.35.y' into android-2.6.35

Conflicts:
	drivers/mmc/core/core.c

Change-Id: If12b25725eccb07b385f5898be75d052ff75a3f2
parents cf1fb10f ea8a52f9
No related branches found
No related tags found
No related merge requests found
Showing
with 85 additions and 20 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment