projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3234f5b e669ba2)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 6 May 2014 18:05:51 +0000 (14:05 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 6 May 2014 18:05:51 +0000 (14:05 -0400)

Trivial merge