git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26c0f03 2f63392)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 18 Mar 2008 07:37:55 +0000 (00:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 18 Mar 2008 07:37:55 +0000 (00:37 -0700)
Conflicts:

drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c


Trivial merge
Pandora Kernel Repository