projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da8fb12 38c1a01)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Nov 2012 19:37:43 +0000 (14:37 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Nov 2012 19:37:43 +0000 (14:37 -0500)

Trivial merge