Skip to content
Commit a62ca69c authored by Kra1o5's avatar Kra1o5
Browse files

Merge remote-tracking branch 'caf/LA.BR.1.2.7_rb1.31' into cm-13.0-namek 

Conflicts:
	drivers/input/misc/Kconfig
	drivers/input/misc/Makefile
parents 695375f3 5c3ac131
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