git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fc7237 d93dc5c)
Merge branch 'master' of github.com:davem330/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 Sep 2011 07:23:13 +0000 (03:23 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Sep 2011 07:23:13 +0000 (03:23 -0400)
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c


Trivial merge
Pandora Kernel Repository