git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c3c3d0 72e2240)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Mar 2009 10:06:47 +0000 (02:06 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Mar 2009 10:06:47 +0000 (02:06 -0800)
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c


Trivial merge
Pandora Kernel Repository