git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9df56b 8c23516)
Merge branch 'master' of git://git.infradead.org/users/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Sep 2011 18:11:55 +0000 (14:11 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Sep 2011 18:11:55 +0000 (14:11 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c


Trivial merge
Pandora Kernel Repository