git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 788c0a5 2e761e0)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Jun 2008 09:22:26 +0000 (02:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Jun 2008 09:22:26 +0000 (02:22 -0700)
Conflicts:

drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h


Trivial merge
Pandora Kernel Repository