git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba5736a 9995ffe)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Dec 2011 20:44:03 +0000 (15:44 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 2 Dec 2011 20:44:03 +0000 (15:44 -0500)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/libertas/cfg.c


Trivial merge
Pandora Kernel Repository