git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd32984 ba54238)
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Sep 2011 14:28:09 +0000 (10:28 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 28 Sep 2011 14:28:09 +0000 (10:28 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-scan.c
net/wireless/nl80211.c


Trivial merge
Pandora Kernel Repository