tree c5873f225d91947f0edc5a82ad36936c39773ae2
parent 03fb8f57c5dd5530c5bcfcd3eabc632456accf75
parent 5c15664a86e18352ccdc2f501907725caa9ab73d
author Todd Poynor <toddpoynor@google.com> 1335825933 -0700
committer Todd Poynor <toddpoynor@google.com> 1335825933 -0700

Merge branch 'android-3.0' into android-omap-3.0

Conflicts:
	drivers/usb/musb/omap2430.c

Change-Id: Iebe1aa88ead0d6128a5d5f426bbc0342827e238a
Signed-off-by: Todd Poynor <toddpoynor@google.com>