summaryrefslogtreecommitdiff
path: root/net/rfkill/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 12:17:31 +0000
committerMark Brown <broonie@kernel.org>2016-12-12 12:17:31 +0000
commitd00b74613fb18dfd0a5aa99270ee2e72d5c808d7 (patch)
treea4a76197dc9cc07a9b64c3834bfc4f139f6447ef /net/rfkill/Makefile
parent56e3d92ddb97d9584622b29d4ecb268e30242b1e (diff)
parentf8192880a102849d84fe0f5e27bc8625a33e031c (diff)
parent3498c5e15db3af90aee7dbe9a0910225422b85c1 (diff)
Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next
gt; Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sebastian Siewior <bigeasy@linutronix.de> Cc: Stephane Eranian <eranian@google.com> Cc: Vince Weaver <vincent.weaver@maine.edu> Fixes: 9d85eb9119f4 ("x86/smpboot: Make logical package management more robust") Link: http://lkml.kernel.org/r/20170131230141.212593966@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core')