Skip to content
Commit ed0a0ed0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup' into HEAD 

Conflicts:
	drivers/staging/tidspbridge/core/wdt.c
	drivers/usb/host/Kconfig
	drivers/w1/masters/omap_hdq.c
parents 17a505ed 9cf1c871
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment