git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed85f2c 50fd440)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Mar 2008 01:48:56 +0000 (18:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Mar 2008 01:48:56 +0000 (18:48 -0700)
Conflicts:

drivers/net/usb/rndis_host.c
drivers/net/wireless/b43/dma.c
net/ipv6/ndisc.c


Trivial merge
Pandora Kernel Repository