]> spindle.queued.net Git - linux-firmware/commit
projects / linux-firmware / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1528f32 ee92508)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 6 Nov 2009 08:55:55 +0000 (00:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Nov 2009 08:55:55 +0000 (00:55 -0800)
commitfc2a85dec30097afd7b86c08d56424bbd120d655
tree9eb243144cdd7cc82c057dfcee9a5158736ed2e3tree | snapshot
parent1528f320df44af68fc9dd05aed88a1badef23d26commit | diff
parentee925081af3d8efe065e441dcc36f4137c03800fcommit | diff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: David S. Miller <davem@davemloft.net>
WHENCE diff1 | diff2 | blob | history
linux-firmware branch with OLPC's libertas blobs included