Android SDK / linux-phytec-ti / ed0a0ed0a4e

Commits

Olof Johansson committed ed0a0ed0a4eM01 Oct 2012

Merge branch 'next/cleanup' into HEAD

Conflicts:
	drivers/staging/tidspbridge/core/wdt.c
	drivers/usb/host/Kconfig
	drivers/w1/masters/omap_hdq.c

Showing diff to9cf1c871526