]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/actbl.h
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 18:50:17 +0000 (14:50 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 18:50:17 +0000 (14:50 -0400)
commitfae172136c0cfc80cb4b13620c861688e671650a
tree3dc683dcd8beb5e61361fadd74736742fd35c70b
parent36ef0b473fbf43d5db23eea4616cc1d18cec245f
parent370bd005937c0e00f9104a602f9fe1dd6b21b54b
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
net/wireless/core.c