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_none.c

libceph: Fix NULL pointer dereference in auth client code

2013-07-03 15:32:55 -07:00

auth_none.h

net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

auth_x_protocol.h

…

auth_x.c

libceph: fix sparse endianness warnings

2015-01-08 20:36:57 +03:00

auth_x.h

libceph: store session key in cephx authorizer

2014-12-17 20:09:50 +03:00

auth.c

libceph: wrap auth methods in a mutex

2013-05-01 21:17:15 -07:00

buffer.c

libceph: nuke ceph_kvfree()

2014-12-17 20:09:50 +03:00

ceph_common.c

libceph, ceph: split ceph_show_options()

2015-04-20 18:55:38 +03:00

ceph_fs.c

…

ceph_hash.c

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

ceph_strings.c

libceph: nuke pool op infrastructure

2015-02-19 13:31:37 +03:00

crypto.c

libceph: do not crash on large auth tickets

2014-11-13 22:21:12 +03:00

crypto.h

net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

debugfs.c

libceph: expose client options through debugfs

2015-04-20 18:55:39 +03:00

Kconfig

libceph: select CRYPTO_CBC in addition to CRYPTO_AES

2014-10-14 21:03:20 +04:00

Makefile

libceph: create source file "net/ceph/snapshot.c"

2013-05-01 21:20:08 -07:00

messenger.c

net: Add a struct net parameter to sock_create_kern

2015-05-11 10:50:17 -04:00

mon_client.c

libceph: use mon_client.c/put_generic_request() more

2015-02-19 13:31:37 +03:00

msgpool.c

libceph: initialize msgpool message types

2012-07-30 09:29:50 -07:00

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

libceph: reference counting pagelist

2014-10-14 12:56:48 -07:00

pagevec.c

mm: gup: use get_user_pages_unlocked

2015-02-11 17:06:05 -08:00

snapshot.c

libceph: create source file "net/ceph/snapshot.c"

2013-05-01 21:20:08 -07:00