]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53b2f82 d70b761)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Aug 2013 17:49:20 +0000 (13:49 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Aug 2013 17:49:20 +0000 (13:49 -0400)
1  2 
net/mac80211/mlme.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/mlme.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.