git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cade455 8065248)
Merge branch 'master' into for-davem
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Apr 2012 18:25:14 +0000 (14:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Apr 2012 18:41:59 +0000 (14:41 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
net/wireless/nl80211.c


Trivial merge
Pandora Kernel Repository