summaryrefslogtreecommitdiff
path: root/net/mac80211/sta_info.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-30 20:46:09 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-30 20:46:09 +0400
commit50f3515828024582402044bcced6804c070c491c (patch)
treef9cf25bee56d0ca54acf4d571536268774dc56ed /net/mac80211/sta_info.h
parent6aba74f2791287ec407e0f92487a725a25908067 (diff)
parent4b2a58abd1e17c0ee53c8dded879e015917cca67 (diff)
downloadlinux-50f3515828024582402044bcced6804c070c491c.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: libceph: Create a new key type "ceph". libceph: Get secret from the kernel keys api when mounting with key=NAME. ceph: Move secret key parsing earlier. libceph: fix null dereference when unregistering linger requests ceph: unlock on error in ceph_osdc_start_request() ceph: fix possible NULL pointer dereference ceph: flush msgr_wq during mds_client shutdown
Diffstat (limited to 'net/mac80211/sta_info.h')
0 files changed, 0 insertions, 0 deletions