drivers/net/b44.h · e01ee14d499e5d09c0a9db0cac2545a018849e3d · xcap / xcap-capability-linux · GitLab

Snippets Groups Projects

15 years ago
9cbc1cb8
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 · 9cbc1cb8
David S. Miller authored 15 years ago
```
Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c
```
9cbc1cb8

History
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
David S. Miller authored 15 years ago
```
Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c
```