git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4077e0 4a1032f)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sun, 11 Apr 2010 21:53:53 +0000 (14:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 11 Apr 2010 21:53:53 +0000 (14:53 -0700)
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c


Trivial merge
Pandora Kernel Repository