David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
crush	crush: straw2 bucket type with an efficient 64-bit crush_ln()	2015-04-22 18:33:43 +03:00
armor.c
auth.c
auth_none.c
auth_none.h
auth_x.c
auth_x.h
auth_x_protocol.h
buffer.c
ceph_common.c	libceph, ceph: split ceph_show_options()	2015-04-20 18:55:38 +03:00
ceph_fs.c
ceph_hash.c
ceph_strings.c
crypto.c
crypto.h
debugfs.c	libceph: expose client options through debugfs	2015-04-20 18:55:39 +03:00
Kconfig
Makefile
messenger.c	net: Add a struct net parameter to sock_create_kern	2015-05-11 10:50:17 -04:00
mon_client.c
msgpool.c
osd_client.c	Revert "libceph: clear r_req_lru_item in __unregister_linger_request()"	2015-05-20 21:02:46 +03:00
osdmap.c	crush: straw2 bucket type with an efficient 64-bit crush_ln()	2015-04-22 18:33:43 +03:00
pagelist.c
pagevec.c
snapshot.c