Merge branch 'for-linus' into next
Merge for-linus branch to sync Elan touchscreen driver code.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/*
|
||||
* public include for LM8333 keypad driver - same license as driver
|
||||
* Copyright (C) 2012 Wolfram Sang, Pengutronix <w.sang@pengutronix.de>
|
||||
* Copyright (C) 2012 Wolfram Sang, Pengutronix <kernel@pengutronix.de>
|
||||
*/
|
||||
|
||||
#ifndef _LM8333_H
|
||||
|
Reference in New Issue
Block a user