projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4885c87 e3685e0)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Feb 2014 20:37:15 +0000 (15:37 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 20 Feb 2014 20:40:14 +0000 (15:40 -0500)

Trivial merge