git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fe5468 ddc4db2)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Apr 2013 18:09:54 +0000 (14:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 10 Apr 2013 18:09:54 +0000 (14:09 -0400)
Conflicts:
drivers/net/wireless/ath/carl9170/debug.c
drivers/net/wireless/ath/carl9170/main.c
net/mac80211/ieee80211_i.h


Trivial merge
Pandora Kernel Repository