leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ada66b54c4
linux/drivers/staging
History
David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-09-12 15:52:44 -07:00
..
android Merge tag 'drm-for-v4.8' of git://people.freedesktop.org/~airlied/linux 2016-08-01 21:44:08 -04:00
board staging: board: line over 80 characters 2016-04-29 17:58:02 -07:00
clocking-wizard Staging: clocking-wizard: CHECK:Please use a blank line 2016-02-07 20:05:31 -08:00
comedi staging: comedi: ni_mio_common: fix AO inttrig backwards compatibility 2016-08-21 17:07:19 +02:00
dgnc Staging and IIO driver update for 4.7-rc1 2016-05-20 22:20:48 -07:00
emxx_udc staging: emxx_udc: allow modular build 2016-07-26 08:47:08 -07:00
fbtft Staging: fbtft: fb_agm1264k-fl: No space is necessary after cast. 2016-03-28 07:30:36 -07:00
fsl-mc staging: fsl-mc: convert mc command build/parse to use C structs 2016-06-26 17:14:03 -07:00
fwserial Staging and IIO driver update for 4.7-rc1 2016-05-20 22:20:48 -07:00
gdm724x staging/gdm724x: fix "alignment should match open parenthesis" issues 2016-05-09 14:25:52 +02:00
goldfish staging: goldfish: audio: fix compiliation on arm 2016-03-11 22:09:09 -08:00
gs_fpgaboot Staging: gs_fpgaboot: remove blank line in io.c 2016-03-29 12:43:14 -07:00
i4l staging: i4l: act2000: remove extra space 2016-05-01 14:33:34 -07:00
iio staging: iio: ad5933: Return correct value for AD5933_OUT_RANGE. 2016-08-15 15:39:04 +01:00
ks7010 staging: ks7010: remove bogus NULL checks 2016-06-18 19:47:00 -07:00
lustre staging/lustre/llite: Close atomic_open race with several openers 2016-08-15 18:25:10 +02:00
media [media] cec: fix off-by-one memset 2016-07-28 20:16:35 -03:00
most Staging: most: Remove __cplusplus check in header files 2016-03-28 07:30:36 -07:00
mt29f_spinand staging: mt29f_spinand: set ECC algorithm explicitly 2016-05-05 23:52:04 +02:00
netlogic Staging: netlogic: Remove & from function name. 2016-03-28 07:30:36 -07:00
nvec Staging: nvec: removes a useless cast on a void pointer 2016-03-28 07:30:36 -07:00
octeon net: ethernet: octeon: use phy_ethtool_{get|set}_link_ksettings 2016-08-08 15:42:20 -07:00
octeon-usb staging: octeon-usb: update TODO 2016-02-25 22:38:16 -08:00
olpc_dcon Revert "Staging: olpc_dcon: Remove obsolete driver" 2016-04-04 13:52:35 -07:00
rtl8188eu Revert "Staging: rtl8188eu: rtw_efuse: Use sizeof type *pointer instead of sizeof type." 2016-06-17 11:21:45 -07:00
rtl8192e treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
rtl8192u rtl8192u: Remove unused semaphore rf_sem 2016-06-18 19:50:48 -07:00
rtl8712 rtl8712: Fixed alignment to match open parenthesis 2016-05-01 13:57:12 -07:00
rtl8723au nl80211: support beacon report scanning 2016-07-06 14:51:31 +02:00
rts5208 staging: rts5208: alignment to match open paranthesis 2016-04-29 17:58:02 -07:00
skein staging: skein: cleanup: align code to parentheses 2016-05-03 14:07:11 -07:00
slicoss staging: slicoss: fix missing blank line 2016-04-29 17:58:02 -07:00
sm750fb staging: sm750fb: initialize max_d to maximum D value of 6 2016-03-29 14:41:15 -07:00
speakup Staging and IIO driver update for 4.7-rc1 2016-05-20 22:20:48 -07:00
unisys staging: unisys: visornic: change return statements 2016-06-07 22:58:16 -07:00
vme Staging and IIO driver update for 4.7-rc1 2016-05-20 22:20:48 -07:00
vt6655 Staging and IIO driver update for 4.7-rc1 2016-05-20 22:20:48 -07:00
vt6656 Staging and IIO driver update for 4.7-rc1 2016-05-20 22:20:48 -07:00
wilc1000 staging: wilc1000: correctly check if associatedsta has not been found 2016-08-21 17:28:21 +02:00
wlan-ng nl80211: support beacon report scanning 2016-07-06 14:51:31 +02:00
xgifb staging: xgifb: fix block comments 2016-03-30 21:34:55 -07:00
Kconfig staging: ks7010: add driver from Nanonote extra-repository 2016-06-07 22:42:53 -07:00
Makefile staging: ks7010: add driver from Nanonote extra-repository 2016-06-07 22:42:53 -07:00