projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 518eefe 7ce8c7a)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 5 Sep 2012 18:48:15 +0000 (14:48 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 5 Sep 2012 18:48:15 +0000 (14:48 -0400)

Trivial merge