projects / sdk / emulator / emulator-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83f0c6d c49dc90)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Jan 2013 19:46:50 +0000 (14:46 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Jan 2013 19:46:50 +0000 (14:46 -0500)

Trivial merge
Domain: SDK / Emulator;