git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 64cad2a 0972ddb)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 26 Apr 2011 19:16:46 +0000 (12:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 26 Apr 2011 19:16:46 +0000 (12:16 -0700)
commit2bd93d7af1581d40e3c4b25242472661cb7c637a
tree43c638422d20857339d8d908d6b65ebb8045edc0tree | snapshot
parent64cad2ade1e6f890531a58318ca9ee013f92ef2fcommit | diff
parent0972ddb2373d5e127aabdcabd8305eff0242cd0bcommit | diff
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 files changed:
drivers/net/atl1c/atl1c_main.c diff1 | diff2 | blob | history
drivers/net/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/bnx2x/bnx2x_cmn.c diff1 | diff2 | blob | history
drivers/net/bonding/bond_3ad.c diff1 | diff2 | blob | history
drivers/net/ehea/ehea_main.c diff1 | diff2 | blob | history
drivers/net/r8169.c diff1 | diff2 | blob | history
drivers/net/wireless/ath/ath9k/recv.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c diff1 | diff2 | blob | history
drivers/net/wireless/iwlwifi/iwl-agn-tx.c diff1 | diff2 | blob | history
net/bluetooth/hci_core.c diff1 | diff2 | blob | history
net/bluetooth/hci_event.c diff1 | diff2 | blob | history
net/bluetooth/l2cap_core.c diff1 | diff2 | blob | history
net/bridge/br_input.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/ipv6/udp.c diff1 | diff2 | blob | history
net/mac80211/cfg.c diff1 | diff2 | blob | history
Pandora Kernel Repository