projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16b0dc2 6aee4ca)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jun 2012 18:36:48 +0000 (14:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Jun 2012 18:36:48 +0000 (14:36 -0400)

Trivial merge