alnsn e35f55c6f0 Resolve conflicts.		2019-01-20 23:14:16 +00:00
..
bsd	Resolve conflicts.	2019-01-20 23:14:16 +00:00
gpl2/dts	Explicitly disable v3d, pixelvalve, and hvs for bcm283x at the moment.	2018-08-22 13:16:41 +00:00
isc/atheros_hal	PR/51540: Henning Petersen: replace , with ;	2016-10-09 14:35:33 +00:00