projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fb9fb1 d2ac49f)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jun 2011 17:58:21 +0000 (13:58 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 6 Jun 2011 17:58:21 +0000 (13:58 -0400)

Trivial merge