forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' into for-next
For applying more ALSA timer cleanups.
- Loading branch information
Showing
429 changed files
with
3,762 additions
and
1,699 deletions.
There are no files selected for viewing
31 changes: 0 additions & 31 deletions
31
Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -846,7 +846,6 @@ M: Laura Abbott <[email protected]> | |
M: Sumit Semwal <[email protected]> | ||
L: [email protected] | ||
S: Supported | ||
F: Documentation/devicetree/bindings/staging/ion/ | ||
F: drivers/staging/android/ion | ||
F: drivers/staging/android/uapi/ion.h | ||
F: drivers/staging/android/uapi/ion_test.h | ||
|
@@ -3116,6 +3115,14 @@ F: drivers/net/ieee802154/cc2520.c | |
F: include/linux/spi/cc2520.h | ||
F: Documentation/devicetree/bindings/net/ieee802154/cc2520.txt | ||
|
||
CCREE ARM TRUSTZONE CRYPTOCELL 700 REE DRIVER | ||
M: Gilad Ben-Yossef <[email protected]> | ||
L: [email protected] | ||
L: [email protected] | ||
S: Supported | ||
F: drivers/staging/ccree/ | ||
W: https://developer.arm.com/products/system-ip/trustzone-cryptocell/cryptocell-700-family | ||
|
||
CEC FRAMEWORK | ||
M: Hans Verkuil <[email protected]> | ||
L: [email protected] | ||
|
@@ -5695,7 +5702,7 @@ M: Alex Elder <[email protected]> | |
M: Greg Kroah-Hartman <[email protected]> | ||
S: Maintained | ||
F: drivers/staging/greybus/ | ||
L: [email protected] | ||
L: [email protected] (moderated for non-subscribers) | ||
|
||
GREYBUS AUDIO PROTOCOLS DRIVERS | ||
M: Vaibhav Agarwal <[email protected]> | ||
|
@@ -9553,10 +9560,6 @@ F: drivers/net/wireless/intersil/orinoco/ | |
|
||
OSD LIBRARY and FILESYSTEM | ||
M: Boaz Harrosh <[email protected]> | ||
M: Benny Halevy <[email protected]> | ||
L: [email protected] | ||
W: http://open-osd.org | ||
T: git git://git.open-osd.org/open-osd.git | ||
S: Maintained | ||
F: drivers/scsi/osd/ | ||
F: include/scsi/osd_* | ||
|
@@ -13858,7 +13861,7 @@ S: Odd fixes | |
F: drivers/net/wireless/wl3501* | ||
|
||
WOLFSON MICROELECTRONICS DRIVERS | ||
L: patches@opensource.wolfsonmicro.com | ||
L: patches@opensource.cirrus.com | ||
T: git https://github.com/CirrusLogic/linux-drivers.git | ||
W: https://github.com/CirrusLogic/linux-drivers/wiki | ||
S: Supported | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/ { | ||
aliases { | ||
ethernet = ðernet; | ||
ethernet0 = ðernet; | ||
}; | ||
}; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/ { | ||
aliases { | ||
ethernet = ðernet; | ||
ethernet0 = ðernet; | ||
}; | ||
}; | ||
|
||
|
Oops, something went wrong.