git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ac38c3 f21f237)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 11 Nov 2008 23:43:02 +0000 (15:43 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Nov 2008 23:43:02 +0000 (15:43 -0800)
Conflicts:

drivers/message/fusion/mptlan.c
drivers/net/sfc/ethtool.c
net/mac80211/debugfs_sta.c


Trivial merge
Pandora Kernel Repository