]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fe7cc7 43c771a)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Nov 2012 19:15:43 +0000 (14:15 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Nov 2012 19:15:43 +0000 (14:15 -0500)
1  2 
net/mac80211/sta_info.c patch | diff1 | diff2 | blob | history
net/mac80211/util.c patch | diff1 | diff2 | blob | history

diff --cc net/mac80211/sta_info.c
Simple merge
diff --cc net/mac80211/util.c
Simple merge
Ubuntu combined Linux kernel mirror