Skip to content
Commit be4af5df authored by Ben Dooks's avatar Ben Dooks
Browse files

Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2 

Conflicts:
	drivers/i2c/busses/i2c-designware-core.c

Fixed up merge conflic
parents ce0fda16 4311051c
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