projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b8ba9f 864a604)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Mar 2014 18:47:16 +0000 (13:47 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 6 Mar 2014 18:47:16 +0000 (13:47 -0500)

Trivial merge