FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 18:07:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
de0a41484c
linux/drivers/s390
History
David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/team/team.c
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/bat_iv_ogm.c
	net/ipv4/fib_frontend.c
	net/ipv4/route.c
	net/l2tp/l2tp_netlink.c

The team, fib_frontend, route, and l2tp_netlink conflicts were simply
overlapping changes.

qmi_wwan and bat_iv_ogm were of the "use HEAD" variety.

With help from Antonio Quartulli.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-09-28 14:40:49 -04:00
..
block s390/dasd: fix read unit address configuration loop 2012-09-17 09:58:21 +02:00
char s390/sclp_sdias: Add missing break and "fall through" 2012-08-08 07:32:55 -07:00
cio s390/cio: invalidate cdev pointer before deregistration 2012-09-06 10:40:40 +02:00
crypto s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
kvm KVM updates for the 3.6 merge window 2012-07-24 12:01:20 -07:00
net ctcm: fix error return code 2012-09-24 15:45:18 -04:00
scsi s390/comments: unify copyright messages and remove file names 2012-07-20 11:15:04 +02:00
Makefile